openstack/python-swiftclient
Code Issues Proposed changes

Merge "Stop decoding object content"

Browse Source
This commit is contained in:
Jenkins
2015-05-29 08:13:16 +00:00
committed by Gerrit Code Review
parent c15e81af9b 7d5c85ad10
commit bcca25a2c8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
swiftclient/client.py
View File

@@ -167,6 +167,8 @@ class HTTPConnection(object):
self.port = self.parsed_url.port self.port = self.parsed_url.port
self.requests_args = {} self.requests_args = {}
self.request_session = requests.Session() self.request_session = requests.Session()
# Don't use requests's default headers
self.request_session.headers = None
if self.parsed_url.scheme not in ('http', 'https'): if self.parsed_url.scheme not in ('http', 'https'):
raise ClientException('Unsupported scheme "%s" in url "%s"' raise ClientException('Unsupported scheme "%s" in url "%s"'
% (self.parsed_url.scheme, url)) % (self.parsed_url.scheme, url))
@@ -235,7 +237,6 @@ class HTTPConnection(object):
return old_getheader(k.lower(), v) return old_getheader(k.lower(), v)
def releasing_read(*args, **kwargs): def releasing_read(*args, **kwargs):
kwargs['decode_content'] = True
chunk = self.resp.raw.read(*args, **kwargs) chunk = self.resp.raw.read(*args, **kwargs)
if not chunk: if not chunk:
# NOTE(sigmavirus24): Release the connection back to the # NOTE(sigmavirus24): Release the connection back to the