summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-10-09 05:06:39 +0000
committerGerrit Code Review <review@openstack.org>2013-10-09 05:06:39 +0000
commitad12bcf23dd22d70b7d34335fadd18b94230754a (patch)
tree7d34d76226680dd9807fd97335d1f9f63cd3e29f
parent7bf27252e57779252fd0ab1cf7f0062f9c27995b (diff)
parent471863581114a5cabc50392f17033ed04a79f37d (diff)
downloadpython-glanceclient-ad12bcf23dd22d70b7d34335fadd18b94230754a.tar.gz
Merge "Fix default value for a header"
-rw-r--r--glanceclient/common/http.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py
index 4cd66ec..dfd746d 100644
--- a/glanceclient/common/http.py
+++ b/glanceclient/common/http.py
@@ -248,7 +248,7 @@ class HTTPClient(object):
resp, body_iter = self._http_request(url, method, **kwargs)
- if 'application/json' in resp.getheader('content-type', None):
+ if 'application/json' in resp.getheader('content-type', ''):
body = ''.join([chunk for chunk in body_iter])
try:
body = json.loads(body)