make all arguments hashable for lru_cache functions

Ouranosinc · Jan 19, 2024 · c32501b · c32501b
1 parent 50a86b7
commit c32501b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/magpie/api/management/user/user_utils.py b/magpie/api/management/user/user_utils.py
@@ -228,7 +228,7 @@ def update_user(user, request, new_user_name=None, new_password=None, new_email=
     # logged user updating itself is forbidden if it corresponds to special users
     # cannot edit reserved keywords nor apply them to another user
     forbidden_user_names_regex = protected_user_name_regex(
-        additional_patterns=[get_constant("MAGPIE_LOGGED_USER", request)], settings_container=request
+        additional_patterns=(get_constant("MAGPIE_LOGGED_USER", request),), settings_container=request
     )
     check_user_name_cases = [user.user_name, new_user_name] if update_username else [user.user_name]
     for check_user_name in check_user_name_cases:

diff --git a/magpie/constants.py b/magpie/constants.py
@@ -25,7 +25,7 @@
 
 if TYPE_CHECKING:
     # pylint: disable=W0611,unused-import
-    from typing import List, Optional
+    from typing import Optional, Tuple
 
     from magpie.typedefs import AnySettingsContainer, SettingValue, Str
 
@@ -194,12 +194,12 @@ def protected_user_name_regex(include_admin=True,
                               include_network=True,
                               additional_patterns=None,
                               settings_container=None):
-    # type: (bool, bool, bool, Optional[List[Str]], Optional[AnySettingsContainer]) -> re.Pattern
+    # type: (bool, bool, bool, Optional[Tuple[Str]], Optional[AnySettingsContainer]) -> re.Pattern
     """
     Return a regular expression that matches all user names that are protected, meaning that they are generated
     by Magpie itself and no regular user account should be created with these user names.
     """
-    patterns = additional_patterns or []
+    patterns = list(additional_patterns or [])
     if include_admin:
         patterns.append(get_constant("MAGPIE_ADMIN_USER", settings_container=settings_container))
     if include_anonymous:
@@ -217,12 +217,12 @@ def protected_user_email_regex(include_admin=True,
                                include_network=True,
                                additional_patterns=None,
                                settings_container=None):
-    # type: (bool, bool, bool, Optional[List[Str]], Optional[AnySettingsContainer]) -> re.Pattern
+    # type: (bool, bool, bool, Optional[Tuple[Str]], Optional[AnySettingsContainer]) -> re.Pattern
     """
     Return a regular expression that matches all user emails that are protected, meaning that they are generated
     by Magpie itself and no regular user account should be created with these user emails.
     """
-    patterns = additional_patterns or []
+    patterns = list(additional_patterns or [])
     if include_admin:
         patterns.append(get_constant("MAGPIE_ADMIN_EMAIL", settings_container=settings_container))
     if include_anonymous: