replace use of utcnow with now(datetime.UTC)

7 files changed, 14 insertions, 13 deletions

diff --git a/fietsboek/models/comment.py b/fietsboek/models/comment.py
index 1c14e5c..66c4adf 100644
--- a/fietsboek/models/comment.py
+++ b/fietsboek/models/comment.py
@@ -38,7 +38,7 @@ class Comment(Base):
     id = Column(Integer, primary_key=True)
     author_id = Column(Integer, ForeignKey("users.id"))
     track_id = Column(Integer, ForeignKey("tracks.id"))
-    date = Column(DateTime)
+    date = Column(DateTime(False))
     title = Column(Text)
     text = Column(Text)
 
diff --git a/fietsboek/models/track.py b/fietsboek/models/track.py
index 962b3ad..7606529 100644
--- a/fietsboek/models/track.py
+++ b/fietsboek/models/track.py
@@ -208,7 +208,7 @@ class Track(Base):
     owner_id = Column(Integer, ForeignKey("users.id"))
     title = Column(Text)
     description = Column(Text)
-    date_raw = Column(DateTime)
+    date_raw = Column(DateTime(False))
     date_tz = Column(Integer)
     visibility = Column(Enum(Visibility))
     link_secret = Column(Text)
@@ -762,9 +762,9 @@ class TrackCache(Base):
     stopped_time = Column(Float)
     max_speed = Column(Float)
     avg_speed = Column(Float)
-    start_time_raw = Column(DateTime)
+    start_time_raw = Column(DateTime(False))
     start_time_tz = Column(Integer)
-    end_time_raw = Column(DateTime)
+    end_time_raw = Column(DateTime(False))
     end_time_tz = Column(Integer)
 
     track: Mapped["Track"] = relationship("Track", back_populates="cache")
@@ -847,7 +847,7 @@ class Upload(Base):
     # pylint: disable=too-many-instance-attributes,too-few-public-methods
     __tablename__ = "uploads"
     id = Column(Integer, primary_key=True)
-    uploaded_at = Column(DateTime)
+    uploaded_at = Column(DateTime(False))
     owner_id = Column(Integer, ForeignKey("users.id"))
     gpx = Column(LargeBinary)
 
diff --git a/fietsboek/models/user.py b/fietsboek/models/user.py
index 6a82791..65e3704 100644
--- a/fietsboek/models/user.py
+++ b/fietsboek/models/user.py
@@ -489,7 +489,7 @@ class FriendRequest(Base):
     id = Column(Integer, primary_key=True)
     sender_id = Column(Integer, ForeignKey("users.id"))
     recipient_id = Column(Integer, ForeignKey("users.id"))
-    date = Column(DateTime)
+    date = Column(DateTime(False))
 
     sender: Mapped["User"] = relationship(
         "User", primaryjoin="User.id == FriendRequest.sender_id", backref="outgoing_requests"
@@ -544,7 +544,7 @@ class Token(Base):
     user_id = Column(Integer, ForeignKey("users.id"))
     uuid = Column(Text)
     token_type = Column(Enum(TokenType))
-    date = Column(DateTime)
+    date = Column(DateTime(False))
 
     user: Mapped["User"] = relationship("User", back_populates="tokens")
 
@@ -560,14 +560,15 @@ class Token(Base):
         :rtype: Token
         """
         token_uuid = str(uuid.uuid4())
-        now = datetime.datetime.utcnow()
+        now = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
         return cls(user=user, uuid=token_uuid, date=now, token_type=token_type)
 
     def age(self) -> datetime.timedelta:
         """Returns the age of the token."""
         if self.date is None:
             return datetime.timedelta()
-        return abs(datetime.datetime.utcnow() - self.date)
+        now = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
+        return abs(now - self.date)
 
 
 Index("idx_token_uuid", Token.uuid, unique=True)
diff --git a/fietsboek/scripts/fietscron.py b/fietsboek/scripts/fietscron.py
index 52236f2..7687e12 100644
--- a/fietsboek/scripts/fietscron.py
+++ b/fietsboek/scripts/fietscron.py
@@ -71,7 +71,7 @@ def remove_old_uploads(engine: Engine):
 def remove_old_tokens(engine: Engine):
     """Removes old tokens from the database."""
     LOGGER.info("Deleting old tokens")
-    limit = datetime.datetime.utcnow() - TOKEN_LIFETIME
+    limit = datetime.datetime.now(datetime.UTC).replace(tzinfo=None) - TOKEN_LIFETIME
     session = Session(engine)
     stmt = delete(models.Token).where(models.Token.date < limit)
     session.execute(stmt)
diff --git a/fietsboek/views/detail.py b/fietsboek/views/detail.py
index 0995892..e2c3b50 100644
--- a/fietsboek/views/detail.py
+++ b/fietsboek/views/detail.py
@@ -214,7 +214,7 @@ def add_comment(request):
     comment = models.Comment(
         track=track,
         author=request.identity,
-        date=datetime.datetime.utcnow(),
+        date=datetime.datetime.now(datetime.UTC).replace(tzinfo=None),
         title=request.params["title"],
         text=request.params["comment"],
     )
diff --git a/fietsboek/views/upload.py b/fietsboek/views/upload.py
index 8316c94..f40d6a5 100644
--- a/fietsboek/views/upload.py
+++ b/fietsboek/views/upload.py
@@ -67,7 +67,7 @@ def do_upload(request):
         LOGGER.info("Could not parse gpx: %s", exc)
         return HTTPFound(request.route_url("upload"))
 
-    now = datetime.datetime.utcnow()
+    now = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
 
     upload = models.Upload(
         owner=request.identity,
diff --git a/fietsboek/views/user_data.py b/fietsboek/views/user_data.py
index 4feb189..829c80b 100644
--- a/fietsboek/views/user_data.py
+++ b/fietsboek/views/user_data.py
@@ -104,7 +104,7 @@ def do_add_friend(request):
     friend_req = models.FriendRequest(
         sender=request.identity,
         recipient=candidate,
-        date=datetime.datetime.utcnow(),
+        date=datetime.datetime.now(datetime.UTC).replace(tzinfo=None),
     )
     request.dbsession.add(friend_req)
     request.session.flash(request.localizer.translate(_("flash.friend_request_sent")))