Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions storages/backends/s3boto.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions tests/test_s3boto.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down