Fix datetime timezone utc

dymmond · May 21, 2024 · 238684d · 238684d
1 parent 6b7feb4
commit 238684d
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 51 deletions.
diff --git a/tests/databases/edgy/test_middleware_data.py b/tests/databases/edgy/test_middleware_data.py
@@ -1,6 +1,6 @@
 import random
 import string
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import AsyncGenerator
 from uuid import uuid4
 
@@ -68,7 +68,7 @@ def generate_user_token(user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -106,7 +106,7 @@ async def authenticate(self) -> str:
  is_password_valid = await user.check_password(self.password)
  if is_password_valid and self.user_can_authenticate(user):
  # Using the access_token_lifetime from the JWT config directly
- time = datetime.now(UTC) + jwt_config.access_token_lifetime
+ time = datetime.now(timezone.utc) + jwt_config.access_token_lifetime
  return self.generate_user_token(user, time=time)
 
  def user_can_authenticate(self, user):
@@ -121,7 +121,7 @@ def generate_user_token(self, user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -206,7 +206,7 @@ async def test_cannot_access_endpoint_without_header(test_client_factory, async_
 
 
 async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -219,7 +219,7 @@ async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, a
 
 
 async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -234,7 +234,7 @@ async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, as
 
 
 async def test_can_access_endpoint_with_valid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(minutes=20)
+ time = datetime.now(timezone.utc) + timedelta(minutes=20)
  token = await get_user_and_token(time=time)
 
  response = await async_client.get(

diff --git a/tests/databases/edgy/test_middleware_payload.py b/tests/databases/edgy/test_middleware_payload.py
@@ -1,6 +1,6 @@
 import random
 import string
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import AsyncGenerator
 from uuid import uuid4
 
@@ -68,7 +68,7 @@ def generate_user_token(user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -106,7 +106,7 @@ async def authenticate(self) -> str:
  is_password_valid = await user.check_password(self.password)
  if is_password_valid and self.user_can_authenticate(user):
  # Using the access_token_lifetime from the JWT config directly
- time = datetime.now(UTC) + jwt_config.access_token_lifetime
+ time = datetime.now(timezone.utc) + jwt_config.access_token_lifetime
  return self.generate_user_token(user, time=time)
 
  def user_can_authenticate(self, user):
@@ -121,7 +121,7 @@ def generate_user_token(self, user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -206,7 +206,7 @@ async def test_cannot_access_endpoint_without_header(test_client_factory, async_
 
 
 async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -219,7 +219,7 @@ async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, a
 
 
 async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -234,7 +234,7 @@ async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, as
 
 
 async def test_can_access_endpoint_with_valid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(minutes=20)
+ time = datetime.now(timezone.utc) + timedelta(minutes=20)
  token = await get_user_and_token(time=time)
 
  response = await async_client.get(

diff --git a/tests/databases/mongoz/test_middleware_data.py b/tests/databases/mongoz/test_middleware_data.py
@@ -1,6 +1,6 @@
 import random
 import string
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import AsyncGenerator
 from uuid import uuid4
 
@@ -52,7 +52,7 @@ def generate_user_token(user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -89,7 +89,7 @@ async def authenticate(self) -> str:
  is_password_valid = await user.check_password(self.password)
  if is_password_valid and self.user_can_authenticate(user):
  # Using the access_token_lifetime from the JWT config directly
- time = datetime.now(UTC) + jwt_config.access_token_lifetime
+ time = datetime.now(timezone.utc) + jwt_config.access_token_lifetime
  return self.generate_user_token(user, time=time)
 
  def user_can_authenticate(self, user):
@@ -104,7 +104,7 @@ def generate_user_token(self, user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -189,7 +189,7 @@ async def test_cannot_access_endpoint_without_header(test_client_factory, async_
 
 
 async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -202,7 +202,7 @@ async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, a
 
 
 async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -217,7 +217,7 @@ async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, as
 
 
 async def test_can_access_endpoint_with_valid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(minutes=20)
+ time = datetime.now(timezone.utc) + timedelta(minutes=20)
  token = await get_user_and_token(time=time)
 
  response = await async_client.get(

diff --git a/tests/databases/mongoz/test_middleware_payload_on_gateway.py b/tests/databases/mongoz/test_middleware_payload_on_gateway.py
@@ -1,6 +1,6 @@
 import random
 import string
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import AsyncGenerator
 from uuid import uuid4
 
@@ -52,7 +52,7 @@ def generate_user_token(user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -89,7 +89,7 @@ async def authenticate(self) -> str:
  is_password_valid = await user.check_password(self.password)
  if is_password_valid and self.user_can_authenticate(user):
  # Using the access_token_lifetime from the JWT config directly
- time = datetime.now(UTC) + jwt_config.access_token_lifetime
+ time = datetime.now(timezone.utc) + jwt_config.access_token_lifetime
  return self.generate_user_token(user, time=time)
 
  def user_can_authenticate(self, user):
@@ -104,7 +104,7 @@ def generate_user_token(self, user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -193,7 +193,7 @@ async def test_cannot_access_endpoint_without_header(test_client_factory, async_
 
 
 async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -206,7 +206,7 @@ async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, a
 
 
 async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -223,7 +223,7 @@ async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, as
 async def test_cannot_access_endpoint_with_invalid_token_on_gateway(
  test_client_factory, async_client
 ):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  response = await async_client.get(
@@ -233,7 +233,7 @@ async def test_cannot_access_endpoint_with_invalid_token_on_gateway(
 
 
 async def test_can_access_endpoint_with_valid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(minutes=20)
+ time = datetime.now(timezone.utc) + timedelta(minutes=20)
  token = await get_user_and_token(time=time)
 
  response = await async_client.get(

diff --git a/tests/databases/mongoz/test_middleware_payload_on_handler.py b/tests/databases/mongoz/test_middleware_payload_on_handler.py
@@ -1,6 +1,6 @@
 import random
 import string
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import AsyncGenerator
 from uuid import uuid4
 
@@ -52,7 +52,7 @@ def generate_user_token(user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -89,7 +89,7 @@ async def authenticate(self) -> str:
  is_password_valid = await user.check_password(self.password)
  if is_password_valid and self.user_can_authenticate(user):
  # Using the access_token_lifetime from the JWT config directly
- time = datetime.now(UTC) + jwt_config.access_token_lifetime
+ time = datetime.now(timezone.utc) + jwt_config.access_token_lifetime
  return self.generate_user_token(user, time=time)
 
  def user_can_authenticate(self, user):
@@ -104,7 +104,7 @@ def generate_user_token(self, user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -192,7 +192,7 @@ async def test_cannot_access_endpoint_without_header(test_client_factory, async_
 
 
 async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -205,7 +205,7 @@ async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, a
 
 
 async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -222,7 +222,7 @@ async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, as
 async def test_cannot_access_endpoint_with_invalid_token_on_handler(
  test_client_factory, async_client
 ):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  response = await async_client.get(
@@ -232,7 +232,7 @@ async def test_cannot_access_endpoint_with_invalid_token_on_handler(
 
 
 async def test_can_access_endpoint_with_valid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(minutes=20)
+ time = datetime.now(timezone.utc) + timedelta(minutes=20)
  token = await get_user_and_token(time=time)
 
  response = await async_client.get(

diff --git a/tests/databases/saffier/test_middleware_data.py b/tests/databases/saffier/test_middleware_data.py
@@ -1,6 +1,6 @@
 import random
 import string
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import AsyncGenerator
 from uuid import uuid4
 
@@ -68,7 +68,7 @@ def generate_user_token(user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -106,7 +106,7 @@ async def authenticate(self) -> str:
  is_password_valid = await user.check_password(self.password)
  if is_password_valid and self.user_can_authenticate(user):
  # Using the access_token_lifetime from the JWT config directly
- time = datetime.now(UTC) + jwt_config.access_token_lifetime
+ time = datetime.now(timezone.utc) + jwt_config.access_token_lifetime
  return self.generate_user_token(user, time=time)
 
  def user_can_authenticate(self, user):
@@ -121,7 +121,7 @@ def generate_user_token(self, user: User, time=None):
  Generates a user token
  """
  if not time:
- later = datetime.now(UTC) + timedelta(minutes=20)
+ later = datetime.now(timezone.utc) + timedelta(minutes=20)
  else:
  later = time
 
@@ -206,7 +206,7 @@ async def test_cannot_access_endpoint_without_header(test_client_factory, async_
 
 
 async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -219,7 +219,7 @@ async def test_cannot_access_endpoint_with_invalid_header(test_client_factory, a
 
 
 async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(seconds=1)
+ time = datetime.now(timezone.utc) + timedelta(seconds=1)
  token = await get_user_and_token(time=time)
 
  with create_client(
@@ -234,7 +234,7 @@ async def test_cannot_access_endpoint_with_invalid_token(test_client_factory, as
 
 
 async def test_can_access_endpoint_with_valid_token(test_client_factory, async_client):
- time = datetime.now(UTC) + timedelta(minutes=20)
+ time = datetime.now(timezone.utc) + timedelta(minutes=20)
  token = await get_user_and_token(time=time)
 
  response = await async_client.get(