Fix datetime deprecation warnings

ArchiveTeam · Jan 5, 2025 · 4e9ab0e · 4e9ab0e
1 parent b03c624
commit 4e9ab0e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/terroroftinytown/format/beacon.py b/terroroftinytown/format/beacon.py
@@ -1,7 +1,8 @@
 # encoding=utf-8
 '''Formatting URL data into the BEACON format.'''
 
-from datetime import datetime
+import datetime
+
 from terroroftinytown.format.base import *
 
 __all__ = ['BEACONWriter']
@@ -24,7 +25,7 @@ def write_header(self, site, *args, **kwargs):
         if self.homepage:
             self.fp.write(('#HOMEPAGE: %s\n' % (self.homepage)).encode('utf8'))
 
-        timestamp = datetime.utcnow()
+        timestamp = datetime.datetime.now(datetime.timezone.utc)
         if 'timestamp' in kwargs:
             assert isinstance('timestamp', datetime), \
                 'timestamp argument must be datetime instance'

diff --git a/terroroftinytown/test/random_result.py b/terroroftinytown/test/random_result.py
@@ -70,7 +70,7 @@ def generate_mock(self):
                     'shortcode': self.generate_shortcode(),
                     'url': self.generate_url(),
                     'encoding': 'ascii',
-                    'datetime': datetime.datetime.utcnow()
+                    'datetime': datetime.datetime.now(datetime.timezone.utc)
                 })
 
             print('Running insertion')

diff --git a/terroroftinytown/tracker/model.py b/terroroftinytown/tracker/model.py
@@ -368,7 +368,7 @@ def release_old(cls, project_id=None, autoqueue_only=False):
                 projects = projects.filter_by(autoqueue=True)
 
             for project in projects:
-                min_time = datetime.datetime.utcnow() - datetime.timedelta(seconds=project.autorelease_time)
+                min_time = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(seconds=project.autorelease_time)
                 query = session.query(Item) \
                     .filter(Item.datetime_claimed <= min_time, Item.project == project)
                 query.update({
@@ -491,7 +491,7 @@ class ErrorReport(Base):
 
     message = Column(String, nullable=False)
     datetime = Column(DateTime, nullable=False,
-                      default=datetime.datetime.utcnow)
+                      default=func.now())
 
     def to_dict(self):
         ans = {x.key:x.value for x in object_state(self).attrs}
@@ -733,7 +733,7 @@ def checkout_item(username, ip_address, version=-1, client_version=-1):
                 new_item = False
 
             if item:
-                item.datetime_claimed = datetime.datetime.utcnow()
+                item.datetime_claimed = datetime.datetime.now(datetime.timezone.utc)
                 item.tamper_key = new_tamper_key()
                 item.username = username
                 item.ip_address = ip_address

diff --git a/terroroftinytown/tracker/template/admin/base.html b/terroroftinytown/tracker/template/admin/base.html
@@ -9,7 +9,7 @@
 <div class="container admin">
 	<div class="row">
 		<div class="logoutLink">
-                  <span style="float: left;">{{ datetime.datetime.utcnow() }}</span>
+                  <span style="float: left;">{{ datetime.datetime.now(datetime.timezone.utc) }}</span>
 			<a href="{{ reverse_url('index') }}">Homepage</a>
 			&middot;
 			<a href="{{ reverse_url('admin.logout') }}">Log out {{ current_user }}</a>