compat: Use more compatible datetime definitions

Author: tuxuser

.pre-commit-config.yaml

@@ -1,47 +1,9 @@
 repos:
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.0
-    hooks:
-      - id: pyupgrade
-        args: [--py36-plus]
-  - repo: https://github.com/psf/black
-    rev: 22.10.0
-    hooks:
-      - id: black
-        args:
-          - --safe
-          - --quiet
-        files: ^((xbox|tests)/.+)?[^/]+\.py$
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 5.0.4
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          # - flake8-docstrings==1.5.0
-          - pydocstyle==5.1.1
-        files: ^(xbox)/.+\.py$
-  - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.4
-    hooks:
-      - id: bandit
-        args:
-          - --quiet
-          - --format=custom
-          - --configfile=bandit.yaml
-        files: ^(xbox|tests)/.+\.py$
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
-    hooks:
-      - id: isort
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
-    hooks:
-      - id: check-executables-have-shebangs
-        stages: [manual]
-      - id: check-json
-  - repo: https://github.com/prettier/prettier
-    rev: 2.0.4
-    hooks:
-      - id: prettier
-        stages: [manual]
-  
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.1.6
+  hooks:
+    # Run the linter.
+    - id: ruff
+    # Run the formatter.
+    - id: ruff-format

tests/conftest.py

@@ -1,4 +1,4 @@
-from datetime import datetime, UTC
+from datetime import datetime, timezone
 import uuid
 
 from ecdsa.keys import SigningKey, VerifyingKey
@@ -29,7 +29,9 @@
 async def auth_mgr(event_loop):
     session = SignedSession()
     mgr = AuthenticationManager(session, "abc", "123", "http://localhost")
-    mgr.oauth = OAuth2TokenResponse.model_validate_json(get_response("auth_oauth2_token"))
+    mgr.oauth = OAuth2TokenResponse.model_validate_json(
+        get_response("auth_oauth2_token")
+    )
     mgr.user_token = XAUResponse.model_validate_json(get_response("auth_user_token"))
     mgr.xsts_token = XSTSResponse.model_validate_json(get_response("auth_xsts_token"))
     yield mgr
@@ -77,4 +79,4 @@ def synthetic_request_signer(ecdsa_signing_key) -> RequestSigner:
 
 @pytest.fixture(scope="session")
 def synthetic_timestamp() -> datetime:
-    return datetime.fromtimestamp(1586999965, UTC)
+    return datetime.fromtimestamp(1586999965, timezone.utc)

xbox/webapi/common/filetimes.py

@@ -25,35 +25,35 @@
 """Tools to convert between Python datetime instances and Microsoft times.
 """
 from calendar import timegm
-import datetime
+from datetime import datetime, timezone, tzinfo, timedelta
 
 # http://support.microsoft.com/kb/167296
 # How To Convert a UNIX time_t to a Win32 FILETIME or SYSTEMTIME
 EPOCH_AS_FILETIME = 116444736000000000  # January 1, 1970 as MS file time
 HUNDREDS_OF_NANOSECONDS = 10000000
 
 
-ZERO = datetime.timedelta(0)
-HOUR = datetime.timedelta(hours=1)
+ZERO = timedelta(0)
+HOUR = timedelta(hours=1)
 
 
-class UTC(datetime.tzinfo):
+class UTC(tzinfo):
     """UTC"""
 
-    def utcoffset(self, dt):
+    def utcoffset(self, dt: datetime) -> timedelta:
         return ZERO
 
-    def tzname(self, dt):
+    def tzname(self, dt: datetime) -> str:
         return "UTC"
 
-    def dst(self, dt):
+    def dst(self, dt: datetime) -> timedelta:
         return ZERO
 
 
 utc = UTC()
 
 
-def dt_to_filetime(dt: datetime.datetime):
+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.
 
@@ -75,7 +75,7 @@ def dt_to_filetime(dt: datetime.datetime):
     return ft + (dt.microsecond * 10)
 
 
-def filetime_to_dt(ft: int):
+def filetime_to_dt(ft: int) -> datetime:
     """Converts a Microsoft filetime number to a Python datetime. The new
     datetime object is time zone-naive but is equivalent to tzinfo=utc.
 
@@ -91,7 +91,7 @@ def filetime_to_dt(ft: int):
     # 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.datetime.fromtimestamp(s, datetime.UTC)
+    dt = datetime.fromtimestamp(s, timezone.utc)
     # Add remainder in as microseconds. Python 3.2 requires an integer
     dt = dt.replace(microsecond=(ns100 // 10))
     return dt