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

@ -76,7 +76,7 @@ try:
from nailgun import entities
from nailgun.config import ServerConfig
HAS_NAILGUN_PACKAGE = True
except:
except Exception:
HAS_NAILGUN_PACKAGE = False
from ansible.module_utils.basic import AnsibleModule

View file

@ -232,7 +232,7 @@ try:
from nailgun import entities, entity_fields, entity_mixins
from nailgun.config import ServerConfig
HAS_NAILGUN_PACKAGE = True
except:
except Exception:
HAS_NAILGUN_PACKAGE = False
from ansible.module_utils.basic import AnsibleModule

View file

@ -138,7 +138,7 @@ warnings.simplefilter('ignore')
def parse_flat_interface(entry, non_numeric='hw_eth_ilo'):
try:
factname = 'hw_eth' + str(int(entry['Port']) - 1)
except:
except Exception:
factname = non_numeric
facts = {
@ -193,7 +193,7 @@ def main():
if name.startswith('Port'):
try:
factname = 'hw_eth' + str(int(value) - 1)
except:
except Exception:
factname = 'hw_eth_ilo'
elif name.startswith('MAC'):
facts[factname] = {
@ -208,7 +208,7 @@ def main():
if name.startswith('Port'):
try:
factname = 'hw_iscsi' + str(int(value) - 1)
except:
except Exception:
factname = 'hw_iscsi_ilo'
elif name.startswith('MAC'):
facts[factname] = {

View file

@ -376,7 +376,7 @@ def main():
# Store cookie for future requests
try:
cookie = result['aaaLogin']['attributes']['outCookie']
except:
except Exception:
module.fail_json(msg='Could not find cookie in output', **result)
# If we would not log out properly, we run out of sessions quickly

View file

@ -164,7 +164,7 @@ RETURN = r'''
try:
from importlib import import_module
HAS_IMPORT_MODULE = True
except:
except Exception:
HAS_IMPORT_MODULE = False
from copy import deepcopy