Update bare exceptions to specify Exception.

This will keep us from accidentally catching program-exiting exceptions
like KeyboardInterupt and SystemExit.

18 files changed, 39 insertions, 39 deletions

diff --git a/contrib/inventory/abiquo.py b/contrib/inventory/abiquo.py
index 621ef96620..90d52d3c6c 100755
--- a/contrib/inventory/abiquo.py
+++ b/contrib/inventory/abiquo.py
@@ -62,7 +62,7 @@ def api_get(link, config):
         result = open_url(url, headers=headers, url_username=config.get('auth', 'apiuser').replace('\n', ''),
                           url_password=config.get('auth', 'apipass').replace('\n', ''))
         return json.loads(result.read())
-    except:
+    except Exception:
         return None
 
 
@@ -99,7 +99,7 @@ def cache_available(config):
 
         try:
             existing = os.stat('/'.join([dpath, 'inventory']))
-        except:
+        except Exception:
             # cache doesn't exist or isn't accessible
             return False
 
diff --git a/contrib/inventory/apstra_aos.py b/contrib/inventory/apstra_aos.py
index c793f29aad..7b9af7db5c 100755
--- a/contrib/inventory/apstra_aos.py
+++ b/contrib/inventory/apstra_aos.py
@@ -463,38 +463,38 @@ class AosInventory(object):
         # Try to reach all parameters from File, if not available try from ENV
         try:
             self.aos_server = config.get('aos', 'aos_server')
-        except:
+        except Exception:
             if 'AOS_SERVER' in os.environ.keys():
                 self.aos_server = os.environ['AOS_SERVER']
 
         try:
             self.aos_server_port = config.get('aos', 'port')
-        except:
+        except Exception:
             if 'AOS_PORT' in os.environ.keys():
                 self.aos_server_port = os.environ['AOS_PORT']
 
         try:
             self.aos_username = config.get('aos', 'username')
-        except:
+        except Exception:
             if 'AOS_USERNAME' in os.environ.keys():
                 self.aos_username = os.environ['AOS_USERNAME']
 
         try:
             self.aos_password = config.get('aos', 'password')
-        except:
+        except Exception:
             if 'AOS_PASSWORD' in os.environ.keys():
                 self.aos_password = os.environ['AOS_PASSWORD']
 
         try:
             self.aos_blueprint = config.get('aos', 'blueprint')
-        except:
+        except Exception:
             if 'AOS_BLUEPRINT' in os.environ.keys():
                 self.aos_blueprint = os.environ['AOS_BLUEPRINT']
 
         try:
             if config.get('aos', 'blueprint_interface') in ['false', 'no']:
                 self.aos_blueprint_int = False
-        except:
+        except Exception:
             pass
 
     def parse_cli_args(self):
diff --git a/contrib/inventory/azure_rm.py b/contrib/inventory/azure_rm.py
index 7da0ed7f98..ba758b7e39 100755
--- a/contrib/inventory/azure_rm.py
+++ b/contrib/inventory/azure_rm.py
@@ -397,7 +397,7 @@ class AzureRM(object):
         for key in AZURE_CREDENTIAL_ENV_MAPPING:
             try:
                 credentials[key] = config.get(profile, key, raw=True)
-            except:
+            except Exception:
                 pass
 
         if credentials.get('client_id') is not None or credentials.get('ad_user') is not None:
@@ -921,7 +921,7 @@ class AzureInventory(object):
         try:
             config = cp.ConfigParser()
             config.read(path)
-        except:
+        except Exception:
             pass
 
         if config is not None:
@@ -929,7 +929,7 @@ class AzureInventory(object):
             for key in AZURE_CONFIG_SETTINGS:
                 try:
                     settings[key] = config.get('azure', key, raw=True)
-                except:
+                except Exception:
                     pass
 
         return settings
diff --git a/contrib/inventory/brook.py b/contrib/inventory/brook.py
index dc983761c0..b8c4bd7341 100755
--- a/contrib/inventory/brook.py
+++ b/contrib/inventory/brook.py
@@ -88,7 +88,7 @@ import json
 
 try:
     import libbrook
-except:
+except Exception:
     sys.exit('Brook.io inventory script requires libbrook. See https://github.com/doalitic/libbrook')
 
 
diff --git a/contrib/inventory/collins.py b/contrib/inventory/collins.py
index 8c7b36c9bc..b768f6b3f9 100755
--- a/contrib/inventory/collins.py
+++ b/contrib/inventory/collins.py
@@ -208,7 +208,7 @@ class CollinsInventory(object):
                     break
                 cur_page += 1
                 num_retries = 0
-            except:
+            except Exception:
                 self.log.error("Error while communicating with Collins, retrying:\n%s", traceback.format_exc())
                 num_retries += 1
         return assets
@@ -277,7 +277,7 @@ class CollinsInventory(object):
         # Locates all server assets from Collins.
         try:
             server_assets = self.find_assets()
-        except:
+        except Exception:
             self.log.error("Error while locating assets from Collins:\n%s", traceback.format_exc())
             return False
 
@@ -288,7 +288,7 @@ class CollinsInventory(object):
                 ip_index = self._asset_get_attribute(asset, 'ANSIBLE_IP_INDEX')
                 try:
                     ip_index = int(ip_index)
-                except:
+                except Exception:
                     self.log.error(
                         "ANSIBLE_IP_INDEX attribute on asset %s not an integer: %s", asset,
                         ip_index)
@@ -350,7 +350,7 @@ class CollinsInventory(object):
         try:
             self.write_to_cache(self.cache, self.cache_path_cache)
             self.write_to_cache(self.inventory, self.cache_path_inventory)
-        except:
+        except Exception:
             self.log.error("Error while writing to cache:\n%s", traceback.format_exc())
             return False
         return True
@@ -388,7 +388,7 @@ class CollinsInventory(object):
             json_inventory = cache.read()
             self.inventory = json.loads(json_inventory)
             return True
-        except:
+        except Exception:
             self.log.error("Error while loading inventory:\n%s",
                            traceback.format_exc())
             self.inventory = {}
@@ -402,7 +402,7 @@ class CollinsInventory(object):
             json_cache = cache.read()
             self.cache = json.loads(json_cache)
             return True
-        except:
+        except Exception:
             self.log.error("Error while loading host cache:\n%s",
                            traceback.format_exc())
             self.cache = {}
diff --git a/contrib/inventory/consul_io.py b/contrib/inventory/consul_io.py
index b4bf022bdb..113f3c99a8 100755
--- a/contrib/inventory/consul_io.py
+++ b/contrib/inventory/consul_io.py
@@ -335,7 +335,7 @@ class ConsulInventory(object):
                     metadata = json.loads(metadata['Value'])
                     for k, v in metadata.items():
                         self.add_metadata(node_data, k, v)
-                except:
+                except Exception:
                     pass
 
     def load_groups_from_kv(self, node_data):
diff --git a/contrib/inventory/docker.py b/contrib/inventory/docker.py
index 93359ea0e0..ba221ff434 100755
--- a/contrib/inventory/docker.py
+++ b/contrib/inventory/docker.py
@@ -364,7 +364,7 @@ from collections import defaultdict
 for path in [os.getcwd(), '', os.path.dirname(os.path.abspath(__file__))]:
     try:
         del sys.path[sys.path.index(path)]
-    except:
+    except Exception:
         pass
 
 HAS_DOCKER_PY = True
diff --git a/contrib/inventory/gce.py b/contrib/inventory/gce.py
index d0285ecf17..59a3ccf246 100755
--- a/contrib/inventory/gce.py
+++ b/contrib/inventory/gce.py
@@ -107,7 +107,7 @@ try:
     from libcloud.compute.types import Provider
     from libcloud.compute.providers import get_driver
     _ = Provider.GCE
-except:
+except Exception:
     sys.exit("GCE inventory script requires libcloud >= 0.13")
 
 
@@ -289,7 +289,7 @@ class GceInventory(object):
             args = list(secrets.GCE_PARAMS)
             kwargs = secrets.GCE_KEYWORD_PARAMS
             secrets_found = True
-        except:
+        except Exception:
             pass
 
         if not secrets_found and secrets_path:
@@ -303,7 +303,7 @@ class GceInventory(object):
                 args = list(getattr(secrets, 'GCE_PARAMS', []))
                 kwargs = getattr(secrets, 'GCE_KEYWORD_PARAMS', {})
                 secrets_found = True
-            except:
+            except Exception:
                 pass
 
         if not secrets_found:
diff --git a/contrib/inventory/linode.py b/contrib/inventory/linode.py
index 5af8d25923..427796be3c 100755
--- a/contrib/inventory/linode.py
+++ b/contrib/inventory/linode.py
@@ -88,7 +88,7 @@ try:
     from chube import api as chube_api
     from chube.datacenter import Datacenter
     from chube.linode_obj import Linode
-except:
+except Exception:
     try:
         # remove local paths and other stuff that may
         # cause an import conflict, as chube is sensitive
diff --git a/contrib/inventory/lxd.py b/contrib/inventory/lxd.py
index 6ee8e13669..78a545a791 100755
--- a/contrib/inventory/lxd.py
+++ b/contrib/inventory/lxd.py
@@ -29,7 +29,7 @@ import sys
 import json
 try:
     import configparser
-except:
+except Exception:
     from six.moves import configparser
 
 # Set up defaults
diff --git a/contrib/inventory/nsot.py b/contrib/inventory/nsot.py
index d7fca297ba..cf1c1e1903 100755
--- a/contrib/inventory/nsot.py
+++ b/contrib/inventory/nsot.py
@@ -254,7 +254,7 @@ class NSoTInventory(object):
         obj[group]['vars'] = hostvars
         try:
             assert isinstance(query, string_types)
-        except:
+        except Exception:
             sys.exit('ERR: Group queries must be a single string\n'
                      '  Group: %s\n'
                      '  Query: %s\n' % (group, query)
diff --git a/contrib/inventory/rackhd.py b/contrib/inventory/rackhd.py
index 536a38a83b..e7a5cca5f5 100755
--- a/contrib/inventory/rackhd.py
+++ b/contrib/inventory/rackhd.py
@@ -69,7 +69,7 @@ def parse_args():
 try:
     # check if rackhd url(ie:10.1.1.45:8080) is specified in the environment
     RACKHD_URL = 'http://' + str(os.environ['RACKHD_URL'])
-except:
+except Exception:
     # use default values
     pass
 
@@ -81,7 +81,7 @@ if (parse_args().host):
     try:
         nodeids += parse_args().host.split(',')
         RackhdInventory(nodeids)
-    except:
+    except Exception:
         pass
 if (parse_args().list):
     try:
@@ -92,5 +92,5 @@ if (parse_args().list):
             if entry['type'] == 'compute':
                 nodeids.append(entry['id'])
         RackhdInventory(nodeids)
-    except:
+    except Exception:
         pass
diff --git a/contrib/inventory/rax.py b/contrib/inventory/rax.py
index 96a32c1fbb..dca3c80bf4 100755
--- a/contrib/inventory/rax.py
+++ b/contrib/inventory/rax.py
@@ -242,7 +242,7 @@ def _list_into_cache(regions):
             # pylint: disable=unexpected-keyword-arg
             ip_versions = map(int, get_config(p, 'rax', 'access_ip_version',
                                               'RAX_ACCESS_IP_VERSION', 4, islist=True))
-    except:
+    except Exception:
         ip_versions = [4]
     else:
         ip_versions = [v for v in ip_versions if v in [4, 6]]
diff --git a/contrib/inventory/rudder.py b/contrib/inventory/rudder.py
index 54bb616840..e361f22de6 100755
--- a/contrib/inventory/rudder.py
+++ b/contrib/inventory/rudder.py
@@ -258,7 +258,7 @@ class RudderInventory(object):
 
         try:
             response, content = self.conn.request(target.geturl(), method, body, headers)
-        except:
+        except Exception:
             self.fail_with_error('Error connecting to Rudder server')
 
         try:
diff --git a/contrib/inventory/stacki.py b/contrib/inventory/stacki.py
index 7af106ec9b..98f35c4fb5 100755
--- a/contrib/inventory/stacki.py
+++ b/contrib/inventory/stacki.py
@@ -53,7 +53,7 @@ import json
 
 try:
     import requests
-except:
+except Exception:
     sys.exit('requests package is required for this inventory script')
 
 
diff --git a/contrib/inventory/vbox.py b/contrib/inventory/vbox.py
index 47fe2f6923..7a0ed702ae 100755
--- a/contrib/inventory/vbox.py
+++ b/contrib/inventory/vbox.py
@@ -40,7 +40,7 @@ def get_hosts(host=None):
         else:
             returned = {'all': set(), '_metadata': {}}
             p = Popen([VBOX, 'list', '-l', 'vms'], stdout=PIPE)
-    except:
+    except Exception:
         sys.exit(1)
 
     hostvars = {}
@@ -50,7 +50,7 @@ def get_hosts(host=None):
 
         try:
             k, v = line.split(':', 1)
-        except:
+        except Exception:
             continue
 
         if k == '':
@@ -67,7 +67,7 @@ def get_hosts(host=None):
                     if 'Value' in ipinfo:
                         a, ip = ipinfo.split(':', 1)
                         hostvars[curname]['ansible_ssh_host'] = ip.strip()
-                except:
+                except Exception:
                     pass
 
             continue
diff --git a/contrib/inventory/zabbix.py b/contrib/inventory/zabbix.py
index 943a53bd03..8de20ea582 100755
--- a/contrib/inventory/zabbix.py
+++ b/contrib/inventory/zabbix.py
@@ -45,7 +45,7 @@ except ImportError:
 
 try:
     from zabbix_api import ZabbixAPI
-except:
+except Exception:
     print("Error: Zabbix API library must be installed: pip install zabbix-api.",
           file=sys.stderr)
     sys.exit(1)
diff --git a/contrib/vault/azure_vault.py b/contrib/vault/azure_vault.py
index e4b0b847c0..0be05c5a98 100755
--- a/contrib/vault/azure_vault.py
+++ b/contrib/vault/azure_vault.py
@@ -305,7 +305,7 @@ class AzureRM(object):
         for key in AZURE_CREDENTIAL_ENV_MAPPING:
             try:
                 credentials[key] = config.get(profile, key, raw=True)
-            except:
+            except Exception:
                 pass
 
         if credentials.get('client_id') is not None or credentials.get('ad_user') is not None:
@@ -571,7 +571,7 @@ class AzureKeyVaultSecret:
         try:
             config = cp.ConfigParser()
             config.read(path)
-        except:
+        except Exception:
             pass
 
         if config is not None:
@@ -579,7 +579,7 @@ class AzureKeyVaultSecret:
             for key in AZURE_VAULT_SETTINGS:
                 try:
                     settings[key] = config.get('azure_keyvault', key, raw=True)
-                except:
+                except Exception:
                     pass
 
         return settings