Combine two try/except together

fractal-analytics-platform · Feb 4, 2025 · 11ed043 · 11ed043
1 parent 69602e6
commit 11ed043
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/fractal_server/config.py b/fractal_server/config.py
@@ -22,7 +22,6 @@
 from typing import TypeVar
 
 from cryptography.fernet import Fernet
-from cryptography.fernet import InvalidToken
 from dotenv import load_dotenv
 from pydantic import BaseModel
 from pydantic import BaseSettings
@@ -651,15 +650,10 @@ def assert_key(key: str):
                             .decrypt(email_values["FRACTAL_EMAIL_PASSWORD"])
                             .decode("utf-8")
                         )
-                    except InvalidToken:
+                    except Exception as e:
                         raise ValueError(
                             "Invalid FRACTAL_EMAIL_PASSWORD. "
-                            f"Original error: '{InvalidToken}'."
-                        )
-                    except ValueError as e:
-                        raise ValueError(
-                            "Invalid FRACTAL_EMAIL_PASSWORD_KEY. "
-                            f"Original error: '{e}'."
+                            f"Original error: {str(e)}."
                         )
 
             values["FRACTAL_EMAIL_SETTINGS"] = MailSettings(