From 9b953715df2349344c53c9d23a4876ee387d09ac Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Fri, 29 Jul 2011 14:45:36 -0400
Subject: [PATCH] Fix for boto1.9b issue 540
 (http://code.google.com/p/boto/issues/detail?id=540)

---
 tests/functional/test_s3.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/functional/test_s3.py b/tests/functional/test_s3.py
index 47d60722c2..3868706284 100644
--- a/tests/functional/test_s3.py
+++ b/tests/functional/test_s3.py
@@ -108,6 +108,14 @@ class TestS3(functional.FunctionalTest):
             self.inited = True
             super(TestS3, self).setUp()
             return
+        except TypeError, e:
+            # This hack is necessary because of a bug in boto 1.9b:
+            # http://code.google.com/p/boto/issues/detail?id=540
+            print ("Failed to connect to S3 with credentials. "
+                   "Got error: %s" % e)
+            self.inited = True
+            super(TestS3, self).setUp()
+            return
 
         self.s3_conn = s3_conn