Move from pytz to zoneinfo

Since Python 3.9 zoneinfo is available and datetime also has a timezone
module attribute which can be used. Also refactor the
utcnow/fromutctimestamp usage to according to this excellent blogpost.

https://blog.ganssle.io/articles/2019/11/utcnow.html

Author: jelly

devel/management/commands/pgp_import.py

@@ -8,9 +8,8 @@
 """
 
 from collections import OrderedDict
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
-from pytz import utc
 import subprocess
 
 from django.core.management.base import BaseCommand, CommandError
@@ -50,14 +49,14 @@ def get_date(epoch_string):
     '''Convert a epoch string into a python 'date' object (not datetime).'''
     if not epoch_string:
         return None
-    return datetime.utcfromtimestamp(int(epoch_string)).date()
+    return datetime.fromtimestamp(int(epoch_string), tz=timezone.utc).date()
 
 
 def get_datetime(epoch_string):
     '''Convert a epoch string into a python 'datetime' object.'''
     if not epoch_string:
         return None
-    return datetime.utcfromtimestamp(int(epoch_string)).replace(tzinfo=utc)
+    return datetime.fromtimestamp(int(epoch_string), tz=timezone.utc)
 
 
 def call_gpg(keyring, *args):

devel/management/commands/reporead.py

@@ -21,8 +21,7 @@
 import re
 import xtarfile as tarfile
 import logging
-from datetime import datetime
-from pytz import utc
+from datetime import datetime, timezone
 
 from django.core.management.base import BaseCommand, CommandError
 from django.db import connections, router, transaction
@@ -120,8 +119,7 @@ def populate(self, values):
                 self.ver, self.rel, self.epoch = parse_version(v[0])
             elif k == 'builddate':
                 try:
-                    builddate = datetime.utcfromtimestamp(int(v[0]))
-                    self.builddate = builddate.replace(tzinfo=utc)
+                    self.builddate = datetime.fromtimestamp(int(v[0]), tz=timezone.utc)
                 except ValueError:
                     logger.warning(
                         'Package %s had unparsable build date %s',

devel/migrations/0009_alter_userprofile_time_zone_alter_userprofile_yob.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import pytz
+import zoneinfo
 
 from django.urls import reverse
 from django.db import models
@@ -23,7 +23,7 @@ class UserProfile(models.Model):
         help_text="When enabled, send user 'flag out-of-date' notifications")
     time_zone = models.CharField(
         max_length=100,
-        choices=make_choice(pytz.common_timezones),
+        choices=make_choice(sorted(zoneinfo.available_timezones())),  # sort as available_timezones output varies
         default="UTC",
         help_text="Used for developer clock page")
     alias = models.CharField(

devel/models.py

@@ -1,7 +1,6 @@
 from collections import defaultdict
-from datetime import timedelta
+from datetime import timedelta, timezone
 
-import pytz
 from django.db.models import F
 from django.template.defaultfilters import filesizeformat
 from django.db import connection
@@ -171,7 +170,7 @@ def signature_time(packages):
         'arch', 'repo', 'packager').filter(signature_bytes__isnull=False)
     for package in packages:
         sig = package.signature
-        sig_date = sig.creation_time.replace(tzinfo=pytz.utc)
+        sig_date = sig.creation_time.replace(tzinfo=timezone.utc)
         package.sig_date = sig_date.date()
         if sig_date > package.build_date + cutoff:
             filtered.append(package)

devel/reports.py

@@ -1,5 +1,4 @@
-from datetime import datetime, time
-from pytz import utc
+from datetime import datetime, timezone, time
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.contrib.admin.models import ADDITION, DELETION
@@ -363,7 +362,7 @@ def item_description(self, item):
         return item.info_html()
 
     def item_pubdate(self, item):
-        return datetime.combine(item.release_date, time()).replace(tzinfo=utc)
+        return datetime.combine(item.release_date, time()).replace(tzinfo=timezone.utc)
 
     def item_updateddate(self, item):
         return item.last_modified
@@ -416,7 +415,7 @@ def item_description(self, item):
         return item.summary
 
     def item_pubdate(self, item):
-        return datetime.combine(item.publishdate, time()).replace(tzinfo=utc)
+        return datetime.combine(item.publishdate, time()).replace(tzinfo=timezone.utc)
 
     def item_updateddate(self, item):
         return item.publishdate

feeds.py

@@ -1,9 +1,8 @@
 # Derived from Django snippets: http://djangosnippets.org/snippets/2242/
 from collections import OrderedDict
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from hashlib import md5
 import traceback
-from pytz import utc
 
 
 class LimitedSizeDict(OrderedDict):
@@ -60,7 +59,7 @@ def filter(self, record):
             duplicate = (cache.get(cache_key) == 1)
             cache.set(cache_key, 1, self.rate)
         else:
-            now = datetime.utcnow().replace(tzinfo=utc)
+            now = datetime.now(timezone.utc)
             min_date = now - timedelta(seconds=self.rate)
             duplicate = (key in self.errors and self.errors[key] >= min_date)
             self.errors[key] = now

main/log.py

@@ -1,7 +1,6 @@
 from itertools import groupby
 from pgpdump import BinaryData
-from pytz import utc
-from datetime import datetime
+from datetime import datetime, timezone
 
 from django.db import models
 from django.db.models import Q
@@ -141,7 +140,7 @@ def updated_mins_ago(self):
         # package was actually pushed to any repo. We don't have that
         # easily available without adding more fields and scripts.
         # See: https://github.com/archlinux/archweb/pull/323
-        now = datetime.utcnow().replace(tzinfo=utc)
+        now = datetime.now(timezone.utc)
         return int((now - self.last_update).total_seconds()) // 60
 
     @property

main/models.py

@@ -10,11 +10,10 @@
 """
 
 from collections import deque
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from http.client import HTTPException
 import logging
 import os
-from pytz import utc
 import re
 import socket
 import ssl
@@ -97,8 +96,7 @@ def wrapper(host, port, family=0, socktype=0, proto=0, flags=0):
 def parse_lastsync(log, data):
     '''lastsync file should be an epoch value created by us.'''
     try:
-        parsed_time = datetime.utcfromtimestamp(int(data))
-        log.last_sync = parsed_time.replace(tzinfo=utc)
+        log.last_sync = datetime.fromtimestamp(int(data), tz=timezone.utc)
     except (TypeError, ValueError):
         # it is bad news to try logging the lastsync value;
         # sometimes we get a crazy-encoded web page.

mirrors/management/commands/mirrorcheck.py

@@ -11,8 +11,7 @@
 import logging
 import time
 
-from datetime import datetime
-from pytz import utc
+from datetime import datetime, timezone
 
 import bleach
 import feedparser
@@ -104,7 +103,7 @@ def parse_entry(self, entry, feed_instance, latest):
             logger.error("feed: '%s' has no published or updated date", url)
             return
 
-        published = datetime.fromtimestamp(time.mktime(published_parsed)).replace(tzinfo=utc)
+        published = datetime.fromtimestamp(time.mktime(published_parsed)).replace(tzinfo=timezone.utc)
 
         if latest and latest.publishdate >= published:
             logger.debug("feed: '%s' has no more new entries", url)