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

@@ -156,7 +156,7 @@ def main():
try:
lam = lm.licenseAssignmentManager
lam.UpdateAssignedLicense(entity=content.about.instanceUuid, licenseKey=license)
except:
except Exception:
module.warn('Could not assign "%s" (%s) to vCenter.' % (license, key.name))
result['licenses'] = list_keys(lm.licenses)

View File

@@ -181,7 +181,7 @@ class TarFileProgressReader(tarfile.ExFileObject):
def __exit__(self, exc_type, exc_value, traceback):
try:
self.close()
except:
except Exception:
pass
def read(self, size=10240):

View File

@@ -229,7 +229,7 @@ class VMwareResourcePool(object):
task = self.resource_pool_obj.Destroy()
success, result = wait_for_task(task)
except:
except Exception:
self.module.fail_json(msg="Failed to remove resource pool '%s' '%s'" % (
self.resource_pool, resource_pool))
self.module.exit_json(changed=changed, result=str(result))