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
parent 5147e792d3
commit 3fba006207
320 changed files with 659 additions and 656 deletions

View File

@@ -588,7 +588,7 @@ def main():
try:
js = json.loads(u_content)
uresp['json'] = js
except:
except Exception:
if PY2:
sys.exc_clear() # Avoid false positive traceback in fail_json() on Python 2
else:

View File

@@ -173,7 +173,7 @@ import json
try:
import pynetbox
HAS_PYNETBOX = True
except:
except ImportError:
HAS_PYNETBOX = False

View File

@@ -632,7 +632,7 @@ class Nmcli(object):
for setting in secrets:
for key in secrets[setting]:
config[setting_name][key] = secrets[setting][key]
except:
except Exception:
pass
def dict_to_string(self, d):

View File

@@ -169,7 +169,7 @@ from collections import defaultdict
try:
from pysnmp.entity.rfc3413.oneliner import cmdgen
has_pysnmp = True
except:
except Exception:
has_pysnmp = False
from ansible.module_utils.basic import AnsibleModule