use timezone.utc instead for back-compat

Author: brandon-doist

sqs_workers/memory_sqs.py

@@ -15,9 +15,9 @@
 
 Ref: https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/sqs.html
 """
-import datetime
 import logging
 import uuid
+from datetime import datetime, timedelta, timezone
 from typing import Any, Dict, List
 
 import attr
@@ -141,8 +141,8 @@ def receive_messages(self, WaitTimeSeconds="0", MaxNumberOfMessages="10", **kwar
         ready_messages = []
         push_back_messages = []
 
-        now = datetime.datetime.now(tz=datetime.UTC)
-        threshold = now + datetime.timedelta(seconds=wait_seconds)
+        now = datetime.now(tz=timezone.utc)
+        threshold = now + timedelta(seconds=wait_seconds)
 
         # before retrieving messages, go through in_flight and return any
         # messages whose "invisible" timeout has expired back to the pool
@@ -197,14 +197,14 @@ def change_message_visibility_batch(self, Entries):
         found_entries = []
         not_found_entries = []
 
-        now = datetime.datetime.now(tz=datetime.UTC)
+        now = datetime.now(tz=timezone.utc)
 
         for e in Entries:
             if e["Id"] in self.in_flight:
                 found_entries.append(e)
                 in_flight_message = self.in_flight[e["Id"]]
                 sec = int(e["VisibilityTimeout"])
-                visible_at = now + datetime.timedelta(seconds=sec)
+                visible_at = now + timedelta(seconds=sec)
                 updated_message = attr.evolve(in_flight_message, visible_at=visible_at)
                 self.in_flight[e["Id"]] = updated_message
             else:
@@ -247,9 +247,7 @@ class MemoryMessage:
     attributes: Dict[str, Any] = attr.ib(factory=dict)
 
     # Internal attribute which contains the execution time.
-    visible_at: datetime.datetime = attr.ib(
-        factory=lambda: datetime.datetime.now(tz=datetime.UTC)
-    )
+    visible_at: datetime = attr.ib(factory=lambda: datetime.now(tz=timezone.utc))
 
     # A unique identifier for the message
     message_id: str = attr.ib(factory=lambda: uuid.uuid4().hex)
@@ -277,20 +275,20 @@ def from_kwargs(cls, queue_impl, kwargs):
         if "MessageGroupId" in kwargs:
             attributes["MessageGroupId"] = kwargs["MessageGroupId"]
 
-        visible_at = datetime.datetime.now(tz=datetime.UTC)
+        visible_at = datetime.now(tz=timezone.utc)
         if "DelaySeconds" in kwargs:
             delay_seconds_int = int(kwargs["DelaySeconds"])
-            visible_at += datetime.timedelta(seconds=delay_seconds_int)
+            visible_at += timedelta(seconds=delay_seconds_int)
 
         return MemoryMessage(
             queue_impl, body, message_atttributes, attributes, visible_at
         )
 
     def change_visibility(self, VisibilityTimeout="0", **kwargs):
         if self.message_id in self.queue_impl.in_flight:
-            now = datetime.datetime.now(tz=datetime.UTC)
+            now = datetime.now(tz=timezone.utc)
             sec = int(VisibilityTimeout)
-            visible_at = now + datetime.timedelta(seconds=sec)
+            visible_at = now + timedelta(seconds=sec)
             updated_message = attr.evolve(self, visible_at=visible_at)
             self.queue_impl.in_flight[self.message_id] = updated_message
         else:

sqs_workers/shutdown_policies.py

@@ -1,4 +1,4 @@
-import datetime
+from datetime import datetime, timedelta, timezone
 from typing import Protocol
 
 
@@ -28,23 +28,22 @@ class IdleShutdown:
 
     def __init__(self, idle_seconds: int) -> None:
         self.idle_seconds = idle_seconds
-        self._idle_delta = datetime.timedelta(seconds=idle_seconds)
+        self._idle_delta = timedelta(seconds=idle_seconds)
         self._is_idle = False
-        self._last_seen = datetime.datetime.now(tz=datetime.UTC)
+        self._last_seen = datetime.now(tz=timezone.utc)
 
     def update_state(self, batch_processing_result) -> None:
         """Update internal state of the shutdown policy"""
         if batch_processing_result.total_count() == 0:
             self._is_idle = True
         else:
             self._is_idle = False
-            self._last_seen = datetime.datetime.now(tz=datetime.UTC)
+            self._last_seen = datetime.now(tz=timezone.utc)
 
     def need_shutdown(self) -> bool:
         if not self._is_idle:
             return False
-        now = datetime.datetime.now(tz=datetime.UTC)
-        return (now - self._last_seen) >= self._idle_delta
+        return (datetime.now(tz=timezone.utc) - self._last_seen) >= self._idle_delta
 
     def __repr__(self) -> str:
         return f"IdleShutdown({self.idle_seconds})"

tests/conftest.py

@@ -1,6 +1,6 @@
 import random
 import string
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 
 import boto3
 import localstack_client.session
@@ -22,7 +22,7 @@ def sqs_session(request):
 
 @pytest.fixture
 def sqs(sqs_session):
-    queue_prefix = f"sqs_workers_tests_{datetime.now(tz=UTC):%Y%m%d}_"
+    queue_prefix = f"sqs_workers_tests_{datetime.now(tz=timezone.utc):%Y%m%d}_"
     sqs = SQSEnv(session=sqs_session, queue_prefix=queue_prefix)
     return sqs