From 6c34650e0edb648b6a1b104fba8c01044a9cbb24 Mon Sep 17 00:00:00 2001 From: Mark Travis Date: Thu, 21 Aug 2014 01:04:46 -0700 Subject: [PATCH] Have python3 properly handle connection refused exceptions. carry remote IP address in socket connect exception object --- websocket/_core.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/websocket/_core.py b/websocket/_core.py index f2480a6..2776853 100644 --- a/websocket/_core.py +++ b/websocket/_core.py @@ -421,6 +421,7 @@ class WebSocket(object): if not addrinfo_list: raise WebSocketException("Host not found.: " + hostname + ":" + str(port)) + err = None for addrinfo in addrinfo_list: family = addrinfo[0] self.sock = socket.socket(family) @@ -434,14 +435,16 @@ class WebSocket(object): try: self.sock.connect(address) except socket.error as error: + error.remote_ip = str(address[0]) if error.errno in (errno.ECONNREFUSED, ): + err = error continue else: raise else: break else: - raise error + raise err if proxy_host: self._tunnel(hostname, port)