From: Jason Madden Date: Wed, 31 Jan 2018 23:30:54 +0000 (-0600) Subject: Don't use a bare except: X-Git-Tag: v1.16.0~23^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9318f8e4fb0ee3eab40c7136a02e1ef99adf34e8;p=thirdparty%2Fdnspython.git Don't use a bare except: This catches things like KeyboardInterrupt and SystemExit that shouldn't be caught here. Under gevent, it breaks Timeout handling. --- diff --git a/dns/resolver.py b/dns/resolver.py index 00323835..853be99a 100644 --- a/dns/resolver.py +++ b/dns/resolver.py @@ -1209,7 +1209,7 @@ def _getaddrinfo(host=None, service=None, family=socket.AF_UNSPEC, socktype=0, v4addrs.append(rdata.address) except dns.resolver.NXDOMAIN: raise socket.gaierror(socket.EAI_NONAME) - except: + except Exception: raise socket.gaierror(socket.EAI_SYSTEM) port = None try: