internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +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/cloud/openstack/os_keystone_domain_facts.py
View File

@@ -111,7 +111,7 @@ def main():
# Let's suppose user is passing domain ID
try:
domains = opcloud.get_domain(name)
except:
except Exception:
domains = opcloud.search_domains(filters={'name': name})
else:

4
lib/ansible/modules/cloud/openstack/os_project.py
View File

@@ -160,13 +160,13 @@ def main():
# We assume admin is passing domain id
dom = cloud.get_domain(domain)['id']
domain = dom
except:
except Exception:
# If we fail, maybe admin is passing a domain name.
# Note that domains have unique names, just like id.
try:
dom = cloud.search_domains(filters={'name': domain})[0]['id']
domain = dom
except:
except Exception:
# Ok, let's hope the user is non-admin and passing a sane id
pass

2
lib/ansible/modules/cloud/openstack/os_project_facts.py
View File

@@ -127,7 +127,7 @@ def main():
# We assume admin is passing domain id
dom = opcloud.get_domain(domain)['id']
domain = dom
except:
except Exception:
# If we fail, maybe admin is passing a domain name.
# Note that domains have unique names, just like id.
dom = opcloud.search_domains(filters={'name': domain})

4
lib/ansible/modules/cloud/openstack/os_user.py
View File

@@ -160,12 +160,12 @@ def _get_domain_id(cloud, domain):
try:
# We assume admin is passing domain id
domain_id = cloud.get_domain(domain)['id']
except:
except Exception:
# If we fail, maybe admin is passing a domain name.
# Note that domains have unique names, just like id.
try:
domain_id = cloud.search_domains(filters={'name': domain})[0]['id']
except:
except Exception:
# Ok, let's hope the user is non-admin and passing a sane id
domain_id = domain

2
lib/ansible/modules/cloud/openstack/os_user_facts.py
View File

@@ -135,7 +135,7 @@ def main():
# We assume admin is passing domain id
dom = opcloud.get_domain(domain)['id']
domain = dom
except:
except Exception:
# If we fail, maybe admin is passing a domain name.
# Note that domains have unique names, just like id.
dom = opcloud.search_domains(filters={'name': domain})