- containers = self._allowed_containers(user, account)
- start = 0
- if marker:
- try:
- start = containers.index(marker) + 1
- except ValueError:
- pass
- if not limit or limit > 10000:
- limit = 10000
- return containers[start:start + limit]
- return self._list_objects(account, '', '/', marker, limit, False, [], until)
+ allowed = self._allowed_containers(user, account)
+ start, limit = self._list_limits(allowed, marker, limit)
+ return allowed[start:start + limit]
+ else:
+ if shared:
+ allowed = [x.split('/', 2)[1] for x in self._shared_paths(account)]
+ start, limit = self._list_limits(allowed, marker, limit)
+ return allowed[start:start + limit]
+ return [x[0] for x in self._list_objects(account, '', '/', marker, limit, False, [], until)]