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

64 inconsistency in parameters #65

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion keg_storage/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def storage_prefix_path(location, filename):
"""Join the location path with the filename to get the full object path"""
if filename.startswith('.'):
filename = filename[1:]
return '/'.join([location.value, filename])
return '/'.join([location.value, filename]) if location else filename

@staticmethod
def storage_generate_filename(filename):
Expand Down
4 changes: 4 additions & 0 deletions keg_storage/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,10 @@ def test_storage_prefix_path(self):
assert ObjectView.storage_prefix_path(StorageLocation.folder1, '.foo.txt') == \
'Folder-One/foo.txt'

def test_storage_prefix_path_none_location(self):
assert ObjectView.storage_prefix_path(None, 'foo.txt') == \
'foo.txt'

def test_storage_get_profile(self):
assert ObjectView.storage_get_profile('storage.s3') == \
flask.current_app.storage.get_interface('storage.s3')
Expand Down