Fixes #112 - Check if bucket exists for path=''

jschneier · Jan 26, 2016 · b95ec91 · mbarrien · Feb 11, 2016 · b95ec91
1 parent 5e14712
commit b95ec91
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/storages/backends/s3boto.py b/storages/backends/s3boto.py
@@ -428,6 +428,13 @@ def delete(self, name):
         self.bucket.delete_key(self._encode_name(name))
 
     def exists(self, name):
+        if not name:  # root element aka the bucket
+            try:
+                self.bucket
+                return True
+            except ImproperlyConfigured:
+                return False
+
         name = self._normalize_name(self._clean_name(name))
         if self.entries:
             return name in self.entries

diff --git a/tests/test_s3boto.py b/tests/test_s3boto.py
@@ -10,6 +10,7 @@
 from django.core.files.base import ContentFile
 import django
 
+from boto.exception import S3ResponseError
 from boto.s3.key import Key
 from boto.utils import parse_ts, ISO8601
 
@@ -196,6 +197,13 @@ def test_storage_open_write(self):
         )
         file._multipart.complete_upload.assert_called_once()
 
+    def test_storage_exists_bucket(self):
+        self.storage._connection.get_bucket.side_effect = S3ResponseError(404, 'No bucket')
+        self.assertFalse(self.storage.exists(''))
+
+        self.storage._connection.get_bucket.side_effect = None
+        self.assertTrue(self.storage.exists(''))
+
     def test_storage_exists(self):
         key = self.storage.bucket.new_key.return_value
         key.exists.return_value = True