diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-11 21:25:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-11 21:25:26 +0000 |
| commit | 02742e602daa30c4fe347386035880359c3448ad (patch) | |
| tree | e7f42b74316774df0f2103aa5b6ab5eeb2ed20e2 /swiftclient/client.py | |
| parent | 790f087a67fcc0cc7730cedd1a225d58a82ddf5d (diff) | |
| parent | f045f5bec2b4fa5c3483d27169b351a66b614f91 (diff) | |
| download | python-swiftclient-02742e602daa30c4fe347386035880359c3448ad.tar.gz | |
Merge "Changed the call to set_tunnel to work in python 2.6 or python 2.7 since its name changed between versions"
Diffstat (limited to 'swiftclient/client.py')
| -rw-r--r-- | swiftclient/client.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py index cb09a37..04a539c 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -194,7 +194,12 @@ def http_connection(url, proxy=None, ssl_compression=True): return request_escaped conn.request = request_wrapper(conn.request) 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 |