Commits

Wes Winham committed 0ce6821

Bumped boto support to 2.x in s3boto

Comments (0)

Files changed (1)

storages/backends/s3boto.py

 from django.utils.encoding import force_unicode, smart_str
 
 try:
-    from boto.s3.connection import S3Connection, S3ResponseError
+    from boto import connect_s3
+    from boto.exception import S3ResponseError
     from boto.s3.key import Key
 except ImportError:
     raise ImproperlyConfigured, "Could not load Boto's S3 bindings.\
         if not access_key and not secret_key:
             access_key, secret_key = self._get_access_keys()
 
-        self.connection = S3Connection(access_key, secret_key)
+        self.connection = connect_s3(access_key, secret_key)
         self._bucket_name = bucket
         self._bucket = None