Update bare exceptions to specify Exception.

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

test/units/module_utils/ec2/test_aws.py

@@ -20,7 +20,7 @@ try:
     import boto3
     import botocore
     HAS_BOTO3 = True
-except:
+except Exception:
     HAS_BOTO3 = False
 
 import pytest

test/units/modules/net_tools/nios/test_nios_module.py

@@ -40,7 +40,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/aireos/aireos_module.py

@@ -39,7 +39,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/aruba/aruba_module.py

@@ -40,7 +40,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/cnos/cnos_module.py

@@ -44,7 +44,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/dellos10/dellos10_module.py

@@ -42,7 +42,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/dellos6/dellos6_module.py

@@ -40,7 +40,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/dellos9/dellos9_module.py

@@ -42,7 +42,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/edgeos/edgeos_module.py

@@ -39,7 +39,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/edgeswitch/edgeswitch_module.py

@@ -39,7 +39,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/enos/enos_module.py

@@ -43,7 +43,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/eos/eos_module.py

@@ -40,7 +40,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/exos/exos_module.py

@@ -39,7 +39,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/ingate/ingate_module.py

@@ -41,7 +41,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/ios/ios_module.py

@@ -40,7 +40,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/iosxr/iosxr_module.py

@@ -40,7 +40,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/ironware/ironware_module.py

@@ -41,7 +41,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/junos/junos_module.py

@@ -44,12 +44,12 @@ def load_fixture(name, content='xml'):
             data = f.read()
         try:
             data = json.load(path)
-        except:
+        except Exception:
             pass
     else:
         try:
             data = parse(path).getroot()
-        except:
+        except Exception:
             pass
 
     fixture_data[path] = data

test/units/modules/network/netvisor/nvos_module.py

@@ -30,7 +30,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/nos/nos_module.py

@@ -39,7 +39,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/nxos/nxos_module.py

@@ -50,7 +50,7 @@ def load_fixture(module_name, name, device=''):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/onyx/onyx_module.py

@@ -39,7 +39,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/opx/opx_module.py

@@ -42,7 +42,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/ovs/ovs_module.py

@@ -40,7 +40,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/routeros/routeros_module.py

@@ -40,7 +40,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/slxos/slxos_module.py

@@ -39,7 +39,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/voss/voss_module.py

@@ -40,7 +40,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/network/vyos/vyos_module.py

@@ -40,7 +40,7 @@ def load_fixture(name):
 
     try:
         data = json.loads(data)
-    except:
+    except Exception:
         pass
 
     fixture_data[path] = data

test/units/modules/packaging/os/test_apt.py

@@ -9,7 +9,7 @@ try:
     from ansible.modules.packaging.os.apt import (
         expand_pkgspec_from_fnmatches,
     )
-except:
+except Exception:
     # Need some more module_utils work (porting urls.py) before we can test
     # modules.  So don't error out in this case.
     if sys.version_info[0] >= 3:

test/units/parsing/utils/test_addresses.py

@@ -74,7 +74,7 @@ class TestParseAddress(unittest.TestCase):
 
             try:
                 (host, port) = parse_address(t)
-            except:
+            except Exception:
                 host = None
                 port = None
 
@@ -87,7 +87,7 @@ class TestParseAddress(unittest.TestCase):
 
             try:
                 (host, port) = parse_address(t, allow_ranges=True)
-            except:
+            except Exception:
                 host = None
                 port = None
 

test/units/plugins/lookup/test_conjur_variable.py

@@ -68,7 +68,7 @@ class TestLookupModule:
         mock_response = MagicMock(spec_set=http_client.HTTPResponse)
         try:
             mock_response.getcode.return_value = 200
-        except:
+        except Exception:
             # HTTPResponse is a Python 3 only feature. This uses a generic mock for python 2.6
             mock_response = MagicMock()
             mock_response.getcode.return_value = 200
@@ -83,7 +83,7 @@ class TestLookupModule:
         mock_response = MagicMock(spec_set=http_client.HTTPResponse)
         try:
             mock_response.getcode.return_value = 200
-        except:
+        except Exception:
             # HTTPResponse is a Python 3 only feature. This uses a generic mock for python 2.6
             mock_response = MagicMock()
             mock_response.getcode.return_value = 200
@@ -99,7 +99,7 @@ class TestLookupModule:
             mock_response = MagicMock(spec_set=http_client.HTTPResponse)
             try:
                 mock_response.getcode.return_value = code
-            except:
+            except Exception:
                 # HTTPResponse is a Python 3 only feature. This uses a generic mock for python 2.6
                 mock_response = MagicMock()
                 mock_response.getcode.return_value = code

test/units/plugins/lookup/test_onepassword.py

@@ -218,7 +218,7 @@ class TestOnePass(unittest.TestCase):
         op = MockOnePass()
         try:
             op.assert_logged_in()
-        except:
+        except Exception:
             self.fail()
 
     def test_onepassword_logged_out(self):