openstack/python-swiftclient
Code Issues Proposed changes

Merge "Changed the call to set_tunnel to work in python 2.6 or python 2.7 since its name changed between versions"

Browse Source
This commit is contained in:
Jenkins 2013-06-11 21:25:26 +00:00 committed by Gerrit Code Review
commit 02742e602d
1 changed files with 6 additions and 1 deletions

7
swiftclient/client.py

@ -194,7 +194,12 @@ def http_connection(url, proxy=None, ssl_compression=True):
return request_escaped return request_escaped
conn.request = request_wrapper(conn.request) conn.request = request_wrapper(conn.request)
if proxy: if proxy:
conn._set_tunnel(parsed.hostname, parsed.port) try:
# python 2.6 method
conn._set_tunnel(parsed.hostname, parsed.port)
except AttributeError:
# python 2.7 method
conn.set_tunnel(parsed.hostname, parsed.port)
return parsed, conn return parsed, conn