Fix duplicate error raises in dbAuth, remove extraneous re-raise in c…

…onnection string and fix type in registryConf2.yaml.

python/lsst/daf/butler/registry/_dbAuth.py

@@ -75,16 +75,14 @@ def __init__(self, path=None, envVar=None, authList=None):
         else:
             secretPath = os.path.expanduser(path)
         if not os.path.isfile(secretPath):
-            raise DbAuthError("No DbAuth configuration file: " + secretPath)
+            raise DbAuthNotFoundError(f"No DbAuth configuration file: {secretPath}")
         mode = os.stat(secretPath).st_mode
         if mode & (stat.S_IRWXG | stat.S_IRWXO) != 0:
             raise DbAuthPermissionsError(
                 "DbAuth configuration file {} has incorrect permissions: "
                 "{:o}".format(secretPath, mode))
 
         try:
-            if not os.path.isfile(secretPath):
-                raise DbAuthNotFoundError(f"DbAuth file not found: {secretPath}")
             with open(secretPath) as secretFile:
                 self.authList = yaml.safe_load(secretFile)
         except Exception as exc:

python/lsst/daf/butler/registry/connectionString.py

@@ -96,9 +96,6 @@ def fromConfig(cls, registryConfig):
         except DbAuthNotFoundError:
             # credentials file doesn't exist or no matches were found
             pass
-        except Exception:
-            # re-raise everything else
-            raise
         else:
             # only assign auth when *no* errors were raised, otherwise assume
             # connection string was correct

tests/config/dbAuth/registryConf2.yaml

@@ -1,5 +1,5 @@
 # minimal configuration required when using explicit 'host-port',
-# also tests '/' are placed correctly when not epxlicit in dbname
+# also tests '/' are placed correctly when not explicit in dbname
 registry:
   db: 'postgresql://host.example.com'
   port: 5432