♻️ Refactor code to use the walrus operator for PYDANTIC_V2 check

yezz123 · Oct 20, 2024 · b28b5cc · b28b5cc
1 parent 40d0a98
commit b28b5cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/authx/config.py b/authx/config.py
@@ -14,10 +14,7 @@
     TokenLocations,
 )
 
-PYDANTIC_V2 = PYDANTIC_VERSION.startswith("2.")
-
-
-if PYDANTIC_V2:
+if PYDANTIC_V2 := PYDANTIC_VERSION.startswith("2."):
     from pydantic_settings import BaseSettings  # pragma: no cover
 else:
     from pydantic import BaseSettings  # type: ignore # pragma: no cover

diff --git a/authx/schema.py b/authx/schema.py
@@ -30,9 +30,7 @@
     TokenType,
 )
 
-PYDANTIC_V2 = PYDANTIC_VERSION.startswith("2.")
-
-if PYDANTIC_V2:
+if PYDANTIC_V2 := PYDANTIC_VERSION.startswith("2."):
     from pydantic import ConfigDict, field_validator  # pragma: no cover
 else:
     from pydantic import Extra, validator  # pragma: no cover

diff --git a/authx/token.py b/authx/token.py
@@ -89,7 +89,7 @@ def create_token(
     if data:
         jwt_claims.update(data)
 
-    payload = {**additional_claims, **jwt_claims}
+    payload = additional_claims | jwt_claims
 
     return jwt.encode(payload=payload, key=key, algorithm=algorithm, headers=headers)