summaryrefslogtreecommitdiff
path: root/swiftclient/client.py
diff options
context:
space:
mode:
Diffstat (limited to 'swiftclient/client.py')
-rw-r--r--swiftclient/client.py7
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