internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update bare exceptions to specify Exception.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/modules/storage/netapp/na_elementsw_backup.py
View File

@@ -125,7 +125,7 @@ import time
HAS_SF_SDK = netapp_utils.has_sf_sdk()
try:
import solidfire.common
except:
except Exception:
HAS_SF_SDK = False

2
lib/ansible/modules/storage/netapp/na_elementsw_cluster_pair.py
View File

@@ -82,7 +82,7 @@ from ansible.module_utils.netapp_module import NetAppModule
HAS_SF_SDK = netapp_utils.has_sf_sdk()
try:
import solidfire.common
except:
except Exception:
HAS_SF_SDK = False

2
lib/ansible/modules/storage/netapp/na_elementsw_ldap.py
View File

@@ -108,7 +108,7 @@ import ansible.module_utils.netapp as netapp_utils
HAS_SF_SDK = netapp_utils.has_sf_sdk()
try:
import solidfire.common
except:
except Exception:
HAS_SF_SDK = False

2
lib/ansible/modules/storage/netapp/na_elementsw_network_interfaces.py
View File

@@ -165,7 +165,7 @@ HAS_SF_SDK = netapp_utils.has_sf_sdk()
try:
from solidfire.models import Network, NetworkConfig
HAS_SF_SDK = True
except:
except Exception:
HAS_SF_SDK = False

2
lib/ansible/modules/storage/netapp/na_elementsw_snapshot_schedule.py
View File

@@ -187,7 +187,7 @@ HAS_SF_SDK = netapp_utils.has_sf_sdk()
try:
from solidfire.custom.models import DaysOfWeekFrequency, Weekday, DaysOfMonthFrequency
from solidfire.common import ApiServerError
except:
except Exception:
HAS_SF_SDK = False

2
lib/ansible/modules/storage/netapp/na_elementsw_vlan.py
View File

@@ -112,7 +112,7 @@ from ansible.module_utils.netapp_elementsw_module import NaElementSWModule
HAS_SF_SDK = netapp_utils.has_sf_sdk()
try:
import solidfire.common
except:
except Exception:
HAS_SF_SDK = False

2
lib/ansible/modules/storage/netapp/na_elementsw_volume.py
View File

@@ -147,7 +147,7 @@ from ansible.module_utils.netapp_elementsw_module import NaElementSWModule
HAS_SF_SDK = netapp_utils.has_sf_sdk()
try:
import solidfire.common
except:
except Exception:
HAS_SF_SDK = False

2
lib/ansible/modules/storage/netapp/na_elementsw_volume_pair.py
View File

@@ -116,7 +116,7 @@ from ansible.module_utils.netapp_module import NetAppModule
HAS_SF_SDK = netapp_utils.has_sf_sdk()
try:
import solidfire.common
except:
except Exception:
HAS_SF_SDK = False

2
lib/ansible/modules/storage/netapp/na_ontap_volume_clone.py
View File

@@ -150,7 +150,7 @@ class NetAppOntapVolumeClone(object):
clone_obj.add_new_child("volume", self.volume)
try:
results = self.server.invoke_successfully(clone_obj, True)
except:
except Exception:
return False
attributes = results.get_child_by_name('attributes')
info = attributes.get_child_by_name('volume-clone-info')

4
lib/ansible/modules/storage/netapp/netapp_e_amg_role.py
View File

@@ -114,7 +114,7 @@ def request(url, data=None, headers=None, method='GET', use_proxy=True,
data = json.loads(raw_data)
else:
raw_data = None
except:
except Exception:
if ignore_errors:
pass
else:
@@ -138,7 +138,7 @@ def has_match(module, ssid, api_url, api_pwd, api_usr, body, name):
try:
amg_rc, amgs = request(url, url_username=api_usr, url_password=api_pwd,
headers=HEADERS)
except:
except Exception:
module.fail_json(msg="Failed to find AMGs on storage array. Id [%s]" % (ssid))
for amg in amgs:

2
lib/ansible/modules/storage/netapp/netapp_e_amg_sync.py
View File

@@ -143,7 +143,7 @@ def request(url, data=None, headers=None, method='GET', use_proxy=True,
data = json.loads(raw_data)
else:
raw_data = None
except:
except Exception:
if ignore_errors:
pass
else:

2
lib/ansible/modules/storage/netapp/netapp_e_auditlog.py
View File

@@ -110,7 +110,7 @@ from ansible.module_utils._text import to_native
try:
from urlparse import urlparse, urlunparse
except:
except Exception:
from urllib.parse import urlparse, urlunparse

4
lib/ansible/modules/storage/netapp/netapp_e_auth.py
View File

@@ -120,7 +120,7 @@ def request(url, data=None, headers=None, method='GET', use_proxy=True,
data = json.loads(raw_data)
else:
raw_data = None
except:
except Exception:
if ignore_errors:
pass
else:
@@ -207,7 +207,7 @@ def set_password(module, ssid, api_url, user, pwd, current_password=None, new_pa
try:
rc, data = request(url, method='POST', data=post_body, headers=HEADERS, url_username=user, url_password=pwd,
validate_certs=module.validate_certs)
except:
except Exception:
# TODO(lorenp): Resolve ignored rc, data
module.fail_json(msg="Wrong or no admin password supplied. Please update your playbook and try again")

2
lib/ansible/modules/storage/netapp/netapp_e_facts.py
View File

@@ -89,7 +89,7 @@ def request(url, data=None, headers=None, method='GET', use_proxy=True,
data = json.loads(raw_data)
else:
data = None
except:
except Exception:
if ignore_errors:
pass
else:

2
lib/ansible/modules/storage/netapp/netapp_e_flashcache.py
View File

@@ -118,7 +118,7 @@ def request(url, data=None, headers=None, method='GET', use_proxy=True,
data = json.loads(raw_data)
else:
raw_data = None
except:
except Exception:
if ignore_errors:
pass
else:

2
lib/ansible/modules/storage/netapp/netapp_e_hostgroup.py
View File

@@ -150,7 +150,7 @@ def request(url, data=None, headers=None, method='GET', use_proxy=True,
data = json.loads(raw_data)
else:
raw_data = None
except:
except Exception:
if ignore_errors:
pass
else:

2
lib/ansible/modules/storage/netapp/netapp_e_snapshot_group.py
View File

@@ -159,7 +159,7 @@ def request(url, data=None, headers=None, method='GET', use_proxy=True,
data = json.loads(raw_data)
else:
raw_data = None
except:
except Exception:
if ignore_errors:
pass
else:

2
lib/ansible/modules/storage/netapp/netapp_e_snapshot_images.py
View File

@@ -106,7 +106,7 @@ def request(url, data=None, headers=None, method='GET', use_proxy=True,
data = json.loads(raw_data)
else:
raw_data = None
except:
except Exception:
if ignore_errors:
pass
else:

2
lib/ansible/modules/storage/netapp/netapp_e_snapshot_volume.py
View File

@@ -133,7 +133,7 @@ def request(url, data=None, headers=None, method='GET', use_proxy=True,
data = json.loads(raw_data)
else:
raw_data = None
except:
except Exception:
if ignore_errors:
pass
else:

2
lib/ansible/modules/storage/netapp/netapp_e_storage_system.py
View File

@@ -119,7 +119,7 @@ def request(url, data=None, headers=None, method='GET', use_proxy=True,
data = json.loads(raw_data)
else:
raw_data = None
except:
except Exception:
if ignore_errors:
pass
else: