Skip to content
This repository was archived by the owner on Aug 20, 2022. It is now read-only.

StorageObject.list() to use prefix #4

Merged
sudorandom merged 2 commits into from
May 16, 2012
Merged

StorageObject.list() to use prefix #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
612d3ea
StorageObject.list() to use prefix
May 16, 2012
9223c9a
Minor Version Bump
May 16, 2012
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 object_storage/consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

See COPYING for license information
"""
__version__ = "0.4.2"
__version__ = "0.4.3"

USER_AGENT = "sl-object-storage-python: %s" % __version__
ENDPOINTS = {
Expand Down
11 changes: 6 additions & 5 deletions object_storage/storage_object.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ def list(self, limit=None, marker=None, base_only=False):
@raises ResponseError
@return: list of StorageObject instances
"""
params = {'format': 'json',
'path': self.name}
params = {'format': 'json',
'prefix': self.name+self.client.delimiter}
if base_only:
params['delimiter'] = self.client.delimiter
if limit:
Expand All @@ -169,12 +169,13 @@ def _formatter(res):
if 'name' in item:
objects[item['name']] = self.client.storage_object(self.container, item['name'], headers=item)
elif 'subdir' in item:
item['name'] = item['subdir'].rstrip('/')
name = item['subdir'].rstrip('/')
item['name'] = name
item['content_type'] = 'application/directory'
objects[item['name']] = self.client.storage_object(self.container, item['name'], headers=item)
return objects.values()
return self.client.make_request('GET', [self.container], params=params, formatter=_formatter)
return self.client.make_request('GET', [self.container], params=params, formatter=_formatter)

def is_dir(self):
""" returns True if content_type is 'text/directory' """
return self.model.content_type == 'text/directory'
Expand Down