diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-29 16:26:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-29 16:26:58 +0000 |
| commit | b040ce4e1a330970516c23452bb8d2ac52c9ac19 (patch) | |
| tree | 7fbadfd751892a58295b6774fbf7eabb262c0e88 /swiftclient/client.py | |
| parent | 9460a946246437845330a8f376a51af7ce6eb4e8 (diff) | |
| parent | 67f5468ee485ac3480530df1e59f8f7f92071f66 (diff) | |
| download | python-swiftclient-b040ce4e1a330970516c23452bb8d2ac52c9ac19.tar.gz | |
Merge "Fix wrong args for get_container with full listing"
Diffstat (limited to 'swiftclient/client.py')
| -rw-r--r-- | swiftclient/client.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py index 56f236c..e5d564d 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -835,7 +835,7 @@ def get_container(url, token, container, marker=None, limit=None, if full_listing: rv = get_container(url, token, container, marker, limit, prefix, delimiter, end_marker, path, http_conn, - service_token, headers=headers) + service_token=service_token, headers=headers) listing = rv[1] while listing: if not delimiter: @@ -844,7 +844,7 @@ def get_container(url, token, container, marker=None, limit=None, marker = listing[-1].get('name', listing[-1].get('subdir')) listing = get_container(url, token, container, marker, limit, prefix, delimiter, end_marker, path, - http_conn, service_token, + http_conn, service_token=service_token, headers=headers)[1] if listing: rv[1].extend(listing) |