Replace timezone.utc with UTC const

Author: tr4nt0r

pyproject.toml

@@ -44,7 +44,7 @@ xbox-xal = "pythonxbox.scripts.xal:main"
 
 [tool.ruff]
 line-length = 88
-target-version = "py310"
+target-version = "py311"
 
 [tool.ruff.lint]
 select = ["E4", "E7", "E9", "F", "UP"]

src/pythonxbox/authentication/models.py

@@ -1,6 +1,6 @@
 """Authentication Models."""
 
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta, UTC
 
 from pydantic import BaseModel, Field
 from pydantic.dataclasses import dataclass
@@ -9,7 +9,7 @@
 
 
 def utc_now():
-    return datetime.now(timezone.utc)
+    return datetime.now(UTC)
 
 
 class XTokenResponse(PascalCaseModel):

src/pythonxbox/common/filetimes.py

@@ -25,7 +25,7 @@
 """Tools to convert between Python datetime instances and Microsoft times."""
 
 from calendar import timegm
-from datetime import datetime, timezone, tzinfo, timedelta
+from datetime import datetime, timedelta, UTC
 
 # http://support.microsoft.com/kb/167296
 # How To Convert a UNIX time_t to a Win32 FILETIME or SYSTEMTIME
@@ -37,30 +37,14 @@
 HOUR = timedelta(hours=1)
 
 
-class UTC(tzinfo):
-    """UTC"""
-
-    def utcoffset(self, dt: datetime) -> timedelta:
-        return ZERO
-
-    def tzname(self, dt: datetime) -> str:
-        return "UTC"
-
-    def dst(self, dt: datetime) -> timedelta:
-        return ZERO
-
-
-utc = UTC()
-
-
 def dt_to_filetime(dt: datetime) -> int:
     """Converts a datetime to Microsoft filetime format. If the object is
     time zone-naive, it is forced to UTC before conversion.
 
     >>> "%.0f" % dt_to_filetime(datetime(2009, 7, 25, 23, 0))
     '128930364000000000'
 
-    >>> "%.0f" % dt_to_filetime(datetime(1970, 1, 1, 0, 0, tzinfo=utc))
+    >>> "%.0f" % dt_to_filetime(datetime(1970, 1, 1, 0, 0, tzinfo=UTC))
     '116444736000000000'
 
     >>> "%.0f" % dt_to_filetime(datetime(1970, 1, 1, 0, 0))
@@ -70,7 +54,7 @@ def dt_to_filetime(dt: datetime) -> int:
     128930364000001000
     """
     if (dt.tzinfo is None) or (dt.tzinfo.utcoffset(dt) is None):
-        dt = dt.replace(tzinfo=utc)
+        dt = dt.replace(tzinfo=UTC)
     ft = EPOCH_AS_FILETIME + (timegm(dt.timetuple()) * HUNDREDS_OF_NANOSECONDS)
     return ft + (dt.microsecond * 10)
 
@@ -91,7 +75,7 @@ def filetime_to_dt(ft: int) -> datetime:
     # Get seconds and remainder in terms of Unix epoch
     (s, ns100) = divmod(ft - EPOCH_AS_FILETIME, HUNDREDS_OF_NANOSECONDS)
     # Convert to datetime object
-    dt = datetime.fromtimestamp(s, timezone.utc)
+    dt = datetime.fromtimestamp(s, UTC)
     # Add remainder in as microseconds. Python 3.2 requires an integer
     dt = dt.replace(microsecond=(ns100 // 10))
     return dt

src/pythonxbox/common/request_signer.py

@@ -5,7 +5,7 @@
 """
 
 import base64
-from datetime import datetime, timezone
+from datetime import datetime, UTC
 import hashlib
 import struct
 
@@ -101,7 +101,7 @@ def sign(
         timestamp: datetime = None,
     ) -> str:
         if timestamp is None:
-            timestamp = datetime.now(timezone.utc)
+            timestamp = datetime.now(UTC)
 
         signature = self._sign_raw(
             method, path_and_query, body, authorization, timestamp

tests/conftest.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import datetime, UTC
 import uuid
 
 from ecdsa.keys import SigningKey, VerifyingKey
@@ -77,4 +77,4 @@ def synthetic_request_signer(ecdsa_signing_key) -> RequestSigner:
 
 @pytest.fixture(scope="session")
 def synthetic_timestamp() -> datetime:
-    return datetime.fromtimestamp(1586999965, timezone.utc)
+    return datetime.fromtimestamp(1586999965, UTC)

tests/test_auth.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta, UTC
 
 from httpx import Response
 import pytest
@@ -41,7 +41,7 @@ async def test_request_tokens(respx_mock, auth_mgr):
 @pytest.mark.asyncio
 async def test_refresh_tokens(respx_mock, auth_mgr):
     # Expire Tokens
-    expired = datetime.now(timezone.utc) - timedelta(days=10)
+    expired = datetime.now(UTC) - timedelta(days=10)
     auth_mgr.oauth.issued = expired
     auth_mgr.user_token.not_after = expired
     auth_mgr.xsts_token.not_after = expired
@@ -63,7 +63,7 @@ async def test_refresh_tokens(respx_mock, auth_mgr):
 
 @pytest.mark.asyncio
 async def test_refresh_tokens_still_valid(auth_mgr):
-    now = datetime.now(timezone.utc)
+    now = datetime.now(UTC)
     auth_mgr.oauth.issued = now
     auth_mgr.user_token.not_after = now + timedelta(days=1)
     auth_mgr.xsts_token.not_after = now + timedelta(days=1)
@@ -73,11 +73,11 @@ async def test_refresh_tokens_still_valid(auth_mgr):
 @pytest.mark.asyncio
 async def test_refresh_tokens_user_still_valid(respx_mock, auth_mgr):
     # Expire Tokens
-    expired = datetime.now(timezone.utc) - timedelta(days=10)
+    expired = datetime.now(UTC) - timedelta(days=10)
     auth_mgr.oauth.issued = expired
     auth_mgr.xsts_token.not_after = expired
 
-    auth_mgr.user_token.not_after = datetime.now(timezone.utc) + timedelta(days=1)
+    auth_mgr.user_token.not_after = datetime.now(UTC) + timedelta(days=1)
     route1 = respx_mock.post("https://login.live.com").mock(
         return_value=Response(200, json=get_response_json("auth_oauth2_token"))
     )