fix: python 3.9 & 3.10 compatibility

Author: Nicolas Steinmetz

arq/utils.py

@@ -2,7 +2,7 @@
 import logging
 import os
 from collections.abc import AsyncGenerator, Sequence
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from functools import lru_cache
 from time import time
 from typing import TYPE_CHECKING, Any, Optional, overload
@@ -53,7 +53,7 @@ def ms_to_datetime(unix_ms: int) -> datetime:
     """
     convert milliseconds to datetime, use the timezone in os.environ
     """
-    dt = datetime.fromtimestamp(unix_ms / 1000, tz=UTC)
+    dt = datetime.fromtimestamp(unix_ms / 1000, tz=timezone.utc)
     tz = get_tz()
     if tz:
         dt = dt.astimezone(tz)

tests/test_jobs.py

@@ -1,6 +1,6 @@
 import asyncio
 import pickle
-from datetime import UTC
+from datetime import timezone
 
 import pytest
 from dirty_equals import IsNow, IsStr
@@ -83,11 +83,11 @@ async def foobar(ctx, *args, **kwargs):
         function='foobar',
         args=(1, 2),
         kwargs={'c': 3},
-        enqueue_time=IsNow(tz=UTC),
+        enqueue_time=IsNow(tz=timezone.utc),
         success=True,
         result=42,
-        start_time=IsNow(tz=UTC),
-        finish_time=IsNow(tz=UTC),
+        start_time=IsNow(tz=timezone.utc),
+        finish_time=IsNow(tz=timezone.utc),
         score=None,
         queue_name=expected_queue_name,
         job_id=IsStr(),
@@ -99,11 +99,11 @@ async def foobar(ctx, *args, **kwargs):
             args=(1, 2),
             kwargs={'c': 3},
             job_try=1,
-            enqueue_time=IsNow(tz=UTC),
+            enqueue_time=IsNow(tz=timezone.utc),
             success=True,
             result=42,
-            start_time=IsNow(tz=UTC),
-            finish_time=IsNow(tz=UTC),
+            start_time=IsNow(tz=timezone.utc),
+            finish_time=IsNow(tz=timezone.utc),
             score=None,
             queue_name=expected_queue_name,
             job_id=j.job_id,

tests/test_main.py

@@ -3,7 +3,7 @@
 import functools
 import logging
 from collections import Counter
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from random import shuffle
 from time import time
 
@@ -134,7 +134,7 @@ async def test_job_info(arq_redis: ArqRedis):
     t_before = time()
     j = await arq_redis.enqueue_job('foobar', 123, a=456)
     info = await j.info()
-    assert info.enqueue_time == IsNow(tz=UTC)
+    assert info.enqueue_time == IsNow(tz=timezone.utc)
     assert info.job_try is None
     assert info.function == 'foobar'
     assert info.args == (123,)
@@ -150,7 +150,7 @@ async def test_repeat_job(arq_redis: ArqRedis):
 
 
 async def test_defer_until(arq_redis: ArqRedis):
-    j1 = await arq_redis.enqueue_job('foobar', _job_id='job_id', _defer_until=datetime(2032, 1, 1, tzinfo=UTC))
+    j1 = await arq_redis.enqueue_job('foobar', _job_id='job_id', _defer_until=datetime(2032, 1, 1, tzinfo=timezone.utc))
     assert isinstance(j1, Job)
     score = await arq_redis.zscore(default_queue_name, 'job_id')
     assert score == 1_956_528_000_000
@@ -254,7 +254,7 @@ async def test_get_jobs(arq_redis: ArqRedis):
             'args': (),
             'kwargs': {'a': 1, 'b': 2, 'c': 3},
             'job_try': None,
-            'enqueue_time': IsNow(tz=UTC),
+            'enqueue_time': IsNow(tz=timezone.utc),
             'score': IsInt(),
             'job_id': '1',
         },
@@ -263,7 +263,7 @@ async def test_get_jobs(arq_redis: ArqRedis):
             'args': (4,),
             'kwargs': {'b': 5, 'c': 6},
             'job_try': None,
-            'enqueue_time': IsNow(tz=UTC),
+            'enqueue_time': IsNow(tz=timezone.utc),
             'score': IsInt(),
             'job_id': '2',
         },
@@ -272,7 +272,7 @@ async def test_get_jobs(arq_redis: ArqRedis):
             'args': (7,),
             'kwargs': {'b': 8},
             'job_try': None,
-            'enqueue_time': IsNow(tz=UTC),
+            'enqueue_time': IsNow(tz=timezone.utc),
             'score': IsInt(),
             'job_id': '3',
         },

tests/test_worker.py

@@ -4,12 +4,11 @@
 import re
 import signal
 import sys
-from datetime import UTC, datetime, timedelta
-from unittest.mock import MagicMock, patch
+from datetime import datetime, timedelta, timezone
+from unittest.mock import MagicMock
 
 import msgpack
 import pytest
-import redis.exceptions
 
 from arq.connections import ArqRedis, RedisSettings
 from arq.constants import abort_jobs_ss, default_queue_name, expires_extra_ms, health_check_key_suffix, job_key_prefix
@@ -919,7 +918,9 @@ async def longfunc(ctx):
 
     caplog.set_level(logging.INFO)
 
-    job = await arq_redis.enqueue_job('longfunc', _job_id='testing', _defer_until=datetime.now(UTC) + timedelta(days=1))
+    job = await arq_redis.enqueue_job(
+        'longfunc', _job_id='testing', _defer_until=datetime.now(timezone.utc) + timedelta(days=1)
+    )
 
     worker: Worker = worker(functions=[func(longfunc, name='longfunc')], allow_abort_jobs=True, poll_delay=0.1)
     assert worker.jobs_complete == 0