Do not use bare except lint

Author: jacomago

channelfinder/ChannelFinderClient.py

@@ -40,18 +40,15 @@ def __init__(self, BaseURL=None, username=None, password=None):
         :param username: user name authorized by channel finder service
         :param password: password for the authorized user
         """
-        try:
-            self.__baseURL = self.__getDefaultConfig("BaseURL", BaseURL)
-            self.__userName = self.__getDefaultConfig("username", username)
-            self.__password = self.__getDefaultConfig("password", password)
-            if self.__userName and self.__password:
-                self.__auth = auth.HTTPBasicAuth(self.__userName, self.__password)
-            else:
-                self.__auth = None
-            self.__session = requests.Session()
-            self.__session.mount(self.__baseURL, HTTPAdapter())
-        except:
-            raise RuntimeError("Failed to create client to " + self.__baseURL)
+        self.__baseURL = self.__getDefaultConfig("BaseURL", BaseURL)
+        self.__userName = self.__getDefaultConfig("username", username)
+        self.__password = self.__getDefaultConfig("password", password)
+        if self.__userName and self.__password:
+            self.__auth = auth.HTTPBasicAuth(self.__userName, self.__password)
+        else:
+            self.__auth = None
+        self.__session = requests.Session()
+        self.__session.mount(self.__baseURL, HTTPAdapter())
 
     def __getDefaultConfig(self, key, ref):
         """

channelfinder/cfMonitorTest.py

@@ -86,10 +86,7 @@ def mainRun(opts, args):
 
 
 def check(pvNames, hostName, iocName):
-    try:
-        client = ChannelFinderClient()
-    except:
-        raise RuntimeError("Unable to create a valid webResourceClient")
+    client = ChannelFinderClient()
     channels = client.find(property=[("hostName", hostName), ("iocName", iocName)])
     if channels and len(pvNames) == len(channels):
         for channel in channels:

channelfinder/cfPropertyManager/CFPropertyManager.py

@@ -5,6 +5,7 @@
 """
 
 from __future__ import print_function
+from configparser import NoSectionError
 import re
 from optparse import OptionParser
 from getpass import getpass
@@ -159,7 +160,7 @@ def __getDefaultConfig(arg, value):
     if value is None:
         try:
             return basecfg.get("DEFAULT", arg)
-        except:
+        except (KeyError, NoSectionError):
             return None
     else:
         return value

channelfinder/cfPropertyManager/__init__.py

@@ -1,3 +1,3 @@
 from .CFPropertyManager import CFPropertyManager
 
-__all__ = ["CFPropertyManager"]
+__all__ = ["CFPropertyManager"]

channelfinder/cfUpdate/CFUpdateIOC.py

@@ -12,6 +12,7 @@
 
 from __future__ import print_function
 
+from configparser import NoSectionError
 import os
 import re
 from optparse import OptionParser
@@ -79,12 +80,7 @@ def updateChannelFinder(
     if hostName is None or iocName is None:
         raise RuntimeError("missing hostName or iocName")
     channels = []
-    try:
-        client = ChannelFinderClient(
-            BaseURL=service, username=username, password=password
-        )
-    except:
-        raise RuntimeError("Unable to create a valid webResourceClient")
+    client = ChannelFinderClient(BaseURL=service, username=username, password=password)
     checkPropertiesExist(client, owner)
     previousChannelsList = client.findByArgs(
         [("hostName", hostName), ("iocName", iocName)]
@@ -279,7 +275,7 @@ def __getDefaultConfig(arg, value):
     if value is None:
         try:
             return basecfg.get("DEFAULT", arg)
-        except:
+        except (KeyError, NoSectionError):
             return None
     else:
         return value

test/testChannelFinderClient.py

@@ -150,7 +150,7 @@ def testCreateAndDeleteTagWithChannel(self):
             "channels": [self.testChannels[0]],
         }
         try:
-            result = self.clientTag.set(tag=testTag)
+            _ = self.clientTag.set(tag=testTag)
             foundtag = self.client.findTag(testTag["name"])
             self.assertIsNotNone(foundtag, "failed to create a test tag")
             self.assertTrue(
@@ -410,7 +410,7 @@ def testCreateAndDeleteProperty(self):
         """
         testProperty = {"name": "setTestProp", "owner": self.propOwner}
         try:
-            result = self.clientProp.set(property=testProperty)
+            _ = self.clientProp.set(property=testProperty)
             foundProperty = self.client.findProperty(testProperty["name"])
             self.assertIsNotNone(foundProperty, "failed to create a test property")
             self.assertTrue(