summaryrefslogtreecommitdiff
path: root/swiftclient/client.py
diff options
context:
space:
mode:
authorAlistair Coles <alistair.coles@hpe.com>2016-02-22 15:05:27 +0000
committerAlistair Coles <alistair.coles@hpe.com>2016-02-22 15:22:44 +0000
commit67f5468ee485ac3480530df1e59f8f7f92071f66 (patch)
tree7e88d9a512d5a27e57d1d3c8f9f91e0c609f280f /swiftclient/client.py
parentda0aa24f28da8508283da85b6a45e29912a927cf (diff)
downloadpython-swiftclient-67f5468ee485ac3480530df1e59f8f7f92071f66.tar.gz
Fix wrong args for get_container with full listing
In client get_container(), when full_listing is true, the calls back to get_container() pass service_token as a positional arg which maps its value to the full_listing arg. It should use a keyword. Change-Id: Iac2af45df124ff33fcb7fbaf1ba959ef06c96378 Closes-Bug: #1496093
Diffstat (limited to 'swiftclient/client.py')
-rw-r--r--swiftclient/client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py
index 58fff7b..ad3fd70 100644
--- a/swiftclient/client.py
+++ b/swiftclient/client.py
@@ -769,7 +769,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:
@@ -778,7 +778,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)