summaryrefslogtreecommitdiff
path: root/glanceclient/common/http.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-06 17:09:00 +0000
committerGerrit Code Review <review@openstack.org>2017-03-06 17:09:00 +0000
commitba46e69eeeb100528b1d29836f055feed043ef95 (patch)
treecd5e4eae22d9ab8f44e04945b1fd51f6fc402e0a /glanceclient/common/http.py
parent333494a6d002e46e8010104b4794b228fa243e75 (diff)
parent6740f570963d742f4f62bccbd9d8da301982712f (diff)
downloadpython-glanceclient-ba46e69eeeb100528b1d29836f055feed043ef95.tar.gz
Merge "Replace functions 'dict.get' and 'del' with 'dict.pop'"
Diffstat (limited to 'glanceclient/common/http.py')
-rw-r--r--glanceclient/common/http.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py
index f169a23..bb9c4b5 100644
--- a/glanceclient/common/http.py
+++ b/glanceclient/common/http.py
@@ -131,9 +131,8 @@ class HTTPClient(_BaseHTTPClient):
self.auth_token = kwargs.get('token')
self.language_header = kwargs.get('language_header')
if self.identity_headers:
- if self.identity_headers.get('X-Auth-Token'):
- self.auth_token = self.identity_headers.get('X-Auth-Token')
- del self.identity_headers['X-Auth-Token']
+ self.auth_token = self.identity_headers.pop('X-Auth-Token',
+ self.auth_token)
self.session = requests.Session()
self.session.headers["User-Agent"] = USER_AGENT