aboutsummaryrefslogtreecommitdiff
path: root/requests/packages/urllib3/util/connection.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-14 19:04:18 +0200
committerDaniele Tricoli <eriol@mornie.org>2015-10-14 19:04:18 +0200
commitcb40ec082506c0d9eb05978839bed2f12541af35 (patch)
tree0fe8938e38767200c05ba3e8071bfe6777f75a3e /requests/packages/urllib3/util/connection.py
parentb4a5af4fcbf4e5d0f741aaf9978c728235b11a56 (diff)
downloadpython-requests-cb40ec082506c0d9eb05978839bed2f12541af35.tar
python-requests-cb40ec082506c0d9eb05978839bed2f12541af35.tar.gz
Import requests_2.8.1.orig.tar.gz
Diffstat (limited to 'requests/packages/urllib3/util/connection.py')
-rw-r--r--requests/packages/urllib3/util/connection.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/requests/packages/urllib3/util/connection.py b/requests/packages/urllib3/util/connection.py
index 859aec6..4f2f0f1 100644
--- a/requests/packages/urllib3/util/connection.py
+++ b/requests/packages/urllib3/util/connection.py
@@ -60,6 +60,8 @@ def create_connection(address, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
"""
host, port = address
+ if host.startswith('['):
+ host = host.strip('[]')
err = None
for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
af, socktype, proto, canonname, sa = res
@@ -78,16 +80,16 @@ def create_connection(address, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
sock.connect(sa)
return sock
- except socket.error as _:
- err = _
+ except socket.error as e:
+ err = e
if sock is not None:
sock.close()
sock = None
if err is not None:
raise err
- else:
- raise socket.error("getaddrinfo returns an empty list")
+
+ raise socket.error("getaddrinfo returns an empty list")
def _set_socket_options(sock, options):