diff options
author | Zuul <zuul@review.openstack.org> | 2018-07-25 00:25:15 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-07-25 00:25:15 +0000 |
commit | 1cf074f4da62b7a42f88aef3c8571e7b6e850823 (patch) | |
tree | 0489726d31501902e1b2f1b0621b3d89f4557213 | |
parent | 1711f0d6bd33282ab741924cbf7c189756379afd (diff) | |
parent | e28b12a1f2156b2e8a790290ae6da08adde3875f (diff) | |
download | python-swiftclient-1cf074f4da62b7a42f88aef3c8571e7b6e850823.tar.gz |
Merge "Remove unnecessary calls to parse_header_string()."3.6.0
-rw-r--r-- | swiftclient/client.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py index 410a001..71801c6 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -529,10 +529,8 @@ def get_auth_1_0(url, user, key, snet, **kwargs): parsed[1] = 'snet-' + netloc url = urlunparse(parsed) - auth_token = resp.getheader('x-auth-token') - if auth_token is not None: - auth_token = parse_header_string(auth_token) - return url, resp.getheader('x-storage-token', auth_token) + token = resp.getheader('x-storage-token', resp.getheader('x-auth-token')) + return url, token def get_keystoneclient_2_0(auth_url, user, key, os_options, **kwargs): @@ -712,14 +710,10 @@ def get_auth(auth_url, user, key, **kwargs): raise ClientException('Unknown auth_version %s specified and no ' 'session found.' % auth_version) - if token is not None: - token = parse_header_string(token) # Override storage url, if necessary if os_options.get('object_storage_url'): return os_options['object_storage_url'], token else: - if storage_url is not None: - return parse_header_string(storage_url), token return storage_url, token |