internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +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

22
lib/ansible/modules/cloud/misc/virt_pool.py
View File

@@ -262,7 +262,7 @@ class LibvirtConnection(object):
else:
try:
state = self.find_entry(entryid).isActive()
except:
except Exception:
return self.module.exit_json(changed=True)
if not state:
return self.module.exit_json(changed=True)
@@ -293,7 +293,7 @@ class LibvirtConnection(object):
try:
state = self.find_entry(entryid).isActive()
return ENTRY_STATE_ACTIVE_MAP.get(state, "unknown")
except:
except Exception:
return ENTRY_STATE_ACTIVE_MAP.get("inactive", "unknown")
def get_uuid(self, entryid):
@@ -319,14 +319,14 @@ class LibvirtConnection(object):
result.append(device.get('path'))
try:
return result
except:
except Exception:
raise ValueError('No devices specified')
def get_format(self, entryid):
xml = etree.fromstring(self.find_entry(entryid).XMLDesc(0))
try:
result = xml.xpath('/pool/source/format')[0].get('type')
except:
except Exception:
raise ValueError('Format not specified')
return result
@@ -334,7 +334,7 @@ class LibvirtConnection(object):
xml = etree.fromstring(self.find_entry(entryid).XMLDesc(0))
try:
result = xml.xpath('/pool/source/host')[0].get('name')
except:
except Exception:
raise ValueError('Host not specified')
return result
@@ -342,7 +342,7 @@ class LibvirtConnection(object):
xml = etree.fromstring(self.find_entry(entryid).XMLDesc(0))
try:
result = xml.xpath('/pool/source/dir')[0].get('path')
except:
except Exception:
raise ValueError('Source path not specified')
return result
@@ -360,7 +360,7 @@ class LibvirtConnection(object):
else:
try:
state = self.find_entry(entryid)
except:
except Exception:
return self.module.exit_json(changed=True)
if not state:
return self.module.exit_json(changed=True)
@@ -371,7 +371,7 @@ class LibvirtConnection(object):
else:
try:
state = self.find_entry(entryid)
except:
except Exception:
return self.module.exit_json(changed=True)
if state:
return self.module.exit_json(changed=True)
@@ -386,7 +386,7 @@ class LibvirtConnection(object):
else:
try:
return self.find_entry(entryid).autostart()
except:
except Exception:
return self.module.exit_json(changed=True)
def set_autostart(self, entryid, val):
@@ -395,7 +395,7 @@ class LibvirtConnection(object):
else:
try:
state = self.find_entry(entryid).autostart()
except:
except Exception:
return self.module.exit_json(changed=True)
if bool(state) != val:
return self.module.exit_json(changed=True)
@@ -413,7 +413,7 @@ class LibvirtConnection(object):
else:
try:
self.find_entry(entryid)
except:
except Exception:
return self.module.exit_json(changed=True)