From: Martin Date: Tue, 2 Aug 2016 20:37:00 +0000 (+0200) Subject: Pylint: remove bare excepts X-Git-Tag: v1.15.0~24^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61fbd8933a4da011bc0ad3148df4b2786d240599;p=thirdparty%2Fdnspython.git Pylint: remove bare excepts Bare excepts should not be used, because they may hide system exceptions such as KeyboardInterupts or SystemExits. --- diff --git a/dns/entropy.py b/dns/entropy.py index 7a2d87d1..de7a70a5 100644 --- a/dns/entropy.py +++ b/dns/entropy.py @@ -70,14 +70,14 @@ class EntropyPool(object): if not self.seeded or self.seed_pid != os.getpid(): try: seed = os.urandom(16) - except: + except Exception: try: r = open('/dev/urandom', 'rb', 0) try: seed = r.read(16) finally: r.close() - except: + except Exception: seed = str(time.time()) self.seeded = True self.seed_pid = os.getpid() @@ -125,7 +125,7 @@ pool = EntropyPool() try: system_random = random.SystemRandom() -except: +except Exception: system_random = None def random_16(): diff --git a/dns/inet.py b/dns/inet.py index cc22e644..73490a9d 100644 --- a/dns/inet.py +++ b/dns/inet.py @@ -85,7 +85,7 @@ def af_for_address(text): try: dns.ipv4.inet_aton(text) return AF_INET - except: + except Exception: try: dns.ipv6.inet_aton(text) return AF_INET6 @@ -103,9 +103,9 @@ def is_multicast(text): try: first = ord(dns.ipv4.inet_aton(text)[0]) return first >= 224 and first <= 239 - except: + except Exception: try: first = ord(dns.ipv6.inet_aton(text)[0]) return first == 255 - except: + except Exception: raise ValueError diff --git a/dns/message.py b/dns/message.py index ff0ea81a..a0df18e6 100644 --- a/dns/message.py +++ b/dns/message.py @@ -898,7 +898,7 @@ class _TextReader(object): raise dns.exception.SyntaxError except dns.exception.SyntaxError: raise dns.exception.SyntaxError - except: + except Exception: rdclass = dns.rdataclass.IN # Type rdtype = dns.rdatatype.from_text(token.value) @@ -931,7 +931,7 @@ class _TextReader(object): raise dns.exception.SyntaxError except dns.exception.SyntaxError: raise dns.exception.SyntaxError - except: + except Exception: ttl = 0 # Class try: @@ -944,7 +944,7 @@ class _TextReader(object): rdclass = self.zone_rdclass except dns.exception.SyntaxError: raise dns.exception.SyntaxError - except: + except Exception: rdclass = dns.rdataclass.IN # Type rdtype = dns.rdatatype.from_text(token.value) diff --git a/dns/name.py b/dns/name.py index ef812cfa..26a33059 100644 --- a/dns/name.py +++ b/dns/name.py @@ -34,7 +34,7 @@ from ._compat import long, binary_type, text_type, unichr try: maxint = sys.maxint -except: +except AttributeError: maxint = (1 << (8 * struct.calcsize("P"))) // 2 - 1 NAMERELN_NONE = 0 diff --git a/dns/query.py b/dns/query.py index 6b76b42e..bfecd43e 100644 --- a/dns/query.py +++ b/dns/query.py @@ -176,7 +176,7 @@ def _destination_and_source(af, where, port, source, source_port): if af is None: try: af = dns.inet.af_for_address(where) - except: + except Exception: af = dns.inet.AF_INET if af == dns.inet.AF_INET: destination = (where, port) diff --git a/dns/resolver.py b/dns/resolver.py index 9a3c0e13..06d2e0fb 100644 --- a/dns/resolver.py +++ b/dns/resolver.py @@ -1212,13 +1212,13 @@ def _getaddrinfo(host=None, service=None, family=socket.AF_UNSPEC, socktype=0, addr = dns.ipv6.inet_aton(ahost) v6addrs.append(host) canonical_name = host - except: + except Exception: try: # Is it a V4 address literal? addr = dns.ipv4.inet_aton(host) v4addrs.append(host) canonical_name = host - except: + except Exception: if flags & socket.AI_NUMERICHOST == 0: try: if family == socket.AF_INET6 or family == socket.AF_UNSPEC: @@ -1250,11 +1250,11 @@ def _getaddrinfo(host=None, service=None, family=socket.AF_UNSPEC, socktype=0, port = 0 else: port = int(service) - except: + except Exception: if flags & socket.AI_NUMERICSERV == 0: try: port = socket.getservbyname(service) - except: + except Exception: pass if port is None: raise socket.gaierror(socket.EAI_NONAME) @@ -1329,7 +1329,7 @@ def _getfqdn(name=None): name = socket.gethostname() try: return _getnameinfo(_getaddrinfo(name, 80)[0][4])[0] - except: + except Exception: return name @@ -1354,7 +1354,7 @@ def _gethostbyaddr(ip): dns.ipv6.inet_aton(ip) sockaddr = (ip, 80, 0, 0) family = socket.AF_INET6 - except: + except Exception: sockaddr = (ip, 80) family = socket.AF_INET (name, port) = _getnameinfo(sockaddr, socket.NI_NAMEREQD) diff --git a/dns/reversename.py b/dns/reversename.py index a27e7050..9ea9395a 100644 --- a/dns/reversename.py +++ b/dns/reversename.py @@ -51,7 +51,7 @@ def from_address(text): else: parts = [x for x in str(binascii.hexlify(v6).decode())] origin = ipv6_reverse_domain - except: + except Exception: parts = ['%d' % byte for byte in bytearray(dns.ipv4.inet_aton(text))] origin = ipv4_reverse_domain diff --git a/dns/zone.py b/dns/zone.py index 4a73e1e4..6c61807b 100644 --- a/dns/zone.py +++ b/dns/zone.py @@ -658,7 +658,7 @@ class _MasterReader(object): raise dns.exception.SyntaxError except dns.exception.SyntaxError: raise dns.exception.SyntaxError - except: + except Exception: rdclass = self.zone.rdclass if rdclass != self.zone.rdclass: raise dns.exception.SyntaxError("RR class is not zone's class") @@ -777,7 +777,7 @@ class _MasterReader(object): raise dns.exception.SyntaxError except dns.exception.SyntaxError: raise dns.exception.SyntaxError - except: + except Exception: rdclass = self.zone.rdclass if rdclass != self.zone.rdclass: raise dns.exception.SyntaxError("RR class is not zone's class") @@ -787,7 +787,7 @@ class _MasterReader(object): token = self.tok.get() if not token.is_identifier(): raise dns.exception.SyntaxError - except: + except Exception: raise dns.exception.SyntaxError("unknown rdatatype '%s'" % token.value) diff --git a/examples/zonediff.py b/examples/zonediff.py index 1b5879cf..69851a18 100755 --- a/examples/zonediff.py +++ b/examples/zonediff.py @@ -199,7 +199,7 @@ The differences shown will be logical differences, not textual differences. if proc.returncode == 0: return proc.stdout sys.stderr.write(err + "\n") - except: + except Exception: sys.stderr.write(err + "\n") if opts.tracebacks: traceback.print_exc() @@ -207,7 +207,7 @@ The differences shown will be logical differences, not textual differences. # Open as normal file try: return open(what, 'rb') - except: + except IOError: sys.stderr.write(err + "\n") if opts.tracebacks: traceback.print_exc() diff --git a/pylintrc b/pylintrc index a904dc98..b22e31e8 100644 --- a/pylintrc +++ b/pylintrc @@ -19,7 +19,7 @@ disable= assigning-non-slot, bad-builtin, bad-continuation, - bare-except, + broad-except, deprecated-method, fixme, getslice-method, diff --git a/tests/test_name.py b/tests/test_name.py index b530f9fb..bf7b297c 100644 --- a/tests/test_name.py +++ b/tests/test_name.py @@ -86,13 +86,13 @@ class NameTestCase(unittest.TestCase): for t in good: try: n = dns.name.from_text(t) - except: + except Exception: self.fail("good test '%s' raised an exception" % t) for t in bad: caught = False try: n = dns.name.from_text(t) - except: + except Exception: caught = True if not caught: self.fail("bad test '%s' did not raise an exception" % t)