From fab3a8dcf4d7cdce55099172e45a6a0978eac4ab Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 22 Feb 2017 22:58:52 +0100 Subject: fix constant definition --- mitmproxy/net/tcp.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mitmproxy/net/tcp.py b/mitmproxy/net/tcp.py index 605a11a7..dc5e2ee2 100644 --- a/mitmproxy/net/tcp.py +++ b/mitmproxy/net/tcp.py @@ -30,8 +30,7 @@ socket_fileobject = socket.SocketIO # workaround for https://bugs.python.org/issue29515 # Python 3.5 and 3.6 for Windows is missing a constant -if not hasattr(socket, 'IPV6_V6ONLY'): - socket.IPV6_V6ONLY = 41 +IPPROTO_IPV6 = getattr(socket, "IPPROTO_IPV6", 41) EINTR = 4 HAS_ALPN = SSL._lib.Cryptography_HAS_ALPN @@ -866,9 +865,9 @@ class TCPServer: # Only works if self.address == "" self.socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self.socket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0) + self.socket.setsockopt(IPPROTO_IPV6, socket.IPV6_V6ONLY, 0) self.socket.bind(self.address) - except: + except socket.error: self.socket = None if not self.socket: -- cgit v1.2.3