fix: Replace deprecated datetime.utcnow() with datetime.now(timezone.utc)

Python 3.12 deprecates datetime.utcnow(), scheduled for removal in 3.14.
Updated 6 files:
- opwen_email_server/mailers/echo.py
- opwen_email_server/mailers/wikipedia.py
- opwen_email_server/utils/email_parser.py
- opwen_email_client/webapp/views.py
- opwen_email_client/webapp/forms/email.py
- opwen_email_client/domain/email/sql_store.py

Author: dahagag

opwen_email_client/domain/email/sql_store.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from datetime import timezone
 
 from sqlalchemy import BLOB
 from sqlalchemy import Boolean
@@ -232,7 +233,7 @@ def _create_attachment(cls, db, attachment):
             db.add(_Attachment.from_dict(db, attachment))
 
     def _mark_sent(self, uids):
-        now = datetime.utcnow()
+        now = datetime.now(timezone.utc).replace(tzinfo=None)
         set_sent_at = {_Email.sent_at: now}
 
         with self._dbwrite() as db:

opwen_email_client/webapp/forms/email.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from datetime import timezone
 from io import BytesIO
 from itertools import chain
 from mimetypes import guess_type
@@ -73,7 +74,7 @@ def as_dict(self, email_store: EmailStore) -> dict:
 
         sent_at = None
         if all(_is_local_message(address) for address in chain(to, cc, bcc)):
-            sent_at = datetime.utcnow().strftime('%Y-%m-%d %H:%M')
+            sent_at = datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M')
 
         form['sent_at'] = sent_at
         form['read'] = True

opwen_email_client/webapp/views.py

@@ -1,5 +1,6 @@
 from datetime import datetime
 from datetime import timedelta
+from datetime import timezone
 from io import BytesIO
 from os import path
 from typing import Iterable
@@ -186,7 +187,7 @@ def register_complete() -> Response:
     user_store = app.ioc.user_store
 
     send_welcome_email = SendWelcomeEmail(
-        time=datetime.utcnow(),
+        time=datetime.now(timezone.utc).replace(tzinfo=None),
         to=current_user.email,
         email_store=app.ioc.email_store,
     )

opwen_email_server/mailers/echo.py

@@ -1,14 +1,19 @@
 from datetime import datetime
+from datetime import timezone
 from typing import Callable
 
 from opwen_email_server.utils.log import LogMixin
 
 ECHO_ADDRESS = 'echo@bot.lokole.ca'
 
 
+def _utcnow() -> datetime:
+    return datetime.now(timezone.utc).replace(tzinfo=None)
+
+
 class EchoEmailFormatter(LogMixin):
 
-    def __init__(self, now: Callable[[], datetime] = datetime.utcnow):
+    def __init__(self, now: Callable[[], datetime] = _utcnow):
         self._now = now
 
     def __call__(self, email: dict) -> dict:

opwen_email_server/mailers/wikipedia.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from datetime import timezone
 from typing import Callable
 from urllib.parse import urlparse
 
@@ -21,7 +22,7 @@ def __init__(self,
                  languages_getter: Callable[[], dict] = languages,
                  language_setter: Callable[[str], None] = set_lang,
                  page_fetch: Callable[[str], WikipediaPage] = page,
-                 now: Callable[[], datetime] = datetime.utcnow):
+                 now: Callable[[], datetime] = lambda: datetime.now(timezone.utc).replace(tzinfo=None)):
         self._now = now
         self._languages = languages_getter
         self._language_setter = language_setter

opwen_email_server/utils/email_parser.py

@@ -140,7 +140,7 @@ def get_domain(address: str) -> str:
 
 def ensure_has_sent_at(email: dict):
     if not email.get('sent_at'):
-        email['sent_at'] = datetime.utcnow().strftime('%Y-%m-%d %H:%M')
+        email['sent_at'] = datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M')
 
 
 def _get_image_type(response: Response, url: str) -> Optional[str]: