Update bare exceptions to specify Exception.

This will keep us from accidentally catching program-exiting exceptions
like KeyboardInterupt and SystemExit.
This commit is contained in:
Toshio Kuratomi 2018-09-07 17:59:46 -07:00
commit 3fba006207
320 changed files with 659 additions and 656 deletions

View file

@ -88,6 +88,6 @@ class LookupModule(LookupBase):
if res is None:
res = ""
ret.append(res)
except:
except Exception:
ret.append("") # connection failed or key not found
return ret

View file

@ -222,7 +222,7 @@ class LookupModule(LookupBase):
try:
socket.inet_aton(ns)
nameservers.append(ns)
except:
except Exception:
try:
nsaddr = dns.resolver.query(ns)[0].address
nameservers.append(nsaddr)
@ -233,7 +233,7 @@ class LookupModule(LookupBase):
if '=' in t:
try:
opt, arg = t.split('=')
except:
except Exception:
pass
if opt == 'qtype':
@ -251,7 +251,7 @@ class LookupModule(LookupBase):
if '/' in t:
try:
domain, qtype = t.split('/')
except:
except Exception:
domain = t
else:
domain = t

View file

@ -116,7 +116,7 @@ def check_output2(*popenargs, **kwargs):
process = subprocess.Popen(*popenargs, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs)
try:
b_out, b_err = process.communicate(b_inputdata)
except:
except Exception:
process.kill()
process.wait()
raise