diff options
| author | Kali Kaneko <kali@leap.se> | 2014-02-28 05:43:27 +0900 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-03-05 12:03:48 -0400 |
| commit | dcff2ecd5ca63b09f5e40cca4e18c4660406d5d6 (patch) | |
| tree | c67f691792320de22c5c29178b1703f67bfb248a /client | |
| parent | 0a3905d9d643117483681bcc1cda2258702dc94d (diff) | |
backward-compatibility for socket.create_connection in 2.6
Closes: #5208
Diffstat (limited to 'client')
| -rw-r--r-- | client/changes/bug_5208_support_socket_26 | 1 | ||||
| -rw-r--r-- | client/src/leap/soledad/client/__init__.py | 14 |
2 files changed, 12 insertions, 3 deletions
diff --git a/client/changes/bug_5208_support_socket_26 b/client/changes/bug_5208_support_socket_26 new file mode 100644 index 00000000..b44d1d4e --- /dev/null +++ b/client/changes/bug_5208_support_socket_26 @@ -0,0 +1 @@ + o Back-compatibility for socket.create_connection interface in 2.6. Closes: #5208 diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py index f0abf130..b5ce7c32 100644 --- a/client/src/leap/soledad/client/__init__.py +++ b/client/src/leap/soledad/client/__init__.py @@ -1311,9 +1311,17 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection): # derived from httplib.py def connect(self): - "Connect to a host on a given (SSL) port." - sock = socket.create_connection((self.host, self.port), - SOLEDAD_TIMEOUT, self.source_address) + """ + Connect to a host on a given (SSL) port. + """ + try: + source = self.source_address + sock = socket.create_connection((self.host, self.port), + SOLEDAD_TIMEOUT, source) + except AttributeError: + # source_address was introduced in 2.7 + sock = socket.create_connection((self.host, self.port), + SOLEDAD_TIMEOUT) if self._tunnel_host: self.sock = sock self._tunnel() |