Upgrade implementation of SQL timestamp

Signed-off-by: Patrik Dufresne <[email protected]>

Author: ikus060

rdiffweb/controller/page_pref_tokens.py

@@ -16,6 +16,7 @@
 
 
 import logging
+from datetime import timezone
 
 import cherrypy
 from markupsafe import Markup, escape
@@ -150,8 +151,9 @@ def is_submitted(self):
         return super().is_submitted() and self.add_access_token.data
 
     def populate_obj(self, userobj):
+        expiration_time = self.expiration.data.replace(tzinfo=timezone.utc) if self.expiration.data else None
         self.secret = userobj.add_access_token(
-            name=self.name.data, expiration_time=self.expiration.data, scope=self.scope.data
+            name=self.name.data, expiration_time=expiration_time, scope=self.scope.data
         )
 
 

rdiffweb/core/model/_timestamp.py

@@ -43,20 +43,14 @@ def _render_to_tsvector_of_sqlite(element, compiler, **kw):
 
 
 class Timestamp(TypeDecorator):
-    """
-    Adjust datetime to store timezone info and restore timezone
-    info whether or not the datetime object as it.
-    """
-
     cache_ok = True
     impl = DateTime
-    LOCAL_TIMEZONE = datetime.now(timezone.utc).astimezone().tzinfo
 
     def process_bind_param(self, value: datetime, dialect):
         if value is None:
             return None
         if value.tzinfo is None:
-            value = value.astimezone(self.LOCAL_TIMEZONE)
+            raise ValueError('datetime without tzinfo: %s' % value)
         return value.astimezone(timezone.utc)
 
     def process_result_value(self, value, dialect):