Merge pull request #53 from IdentityPython/timezone_awarness

Timezone awareness

Author: peppelinux

setup.py

@@ -67,7 +67,7 @@ def run_tests(self):
         "Programming Language :: Python :: 3.8",
         "Topic :: Software Development :: Libraries :: Python Modules"],
     install_requires=[
-        "cryptojwt>=1.5.2",
+        "cryptojwt==1.6.0",
         "pyOpenSSL",
         "filelock>=3.0.12",
         'pyyaml>=5.1.2'

src/oidcmsg/__init__.py

@@ -1,5 +1,5 @@
 __author__ = "Roland Hedberg"
-__version__ = "1.5.2"
+__version__ = "1.5.3"
 
 import os
 from typing import Dict

src/oidcmsg/time_util.py

@@ -26,6 +26,7 @@
 import time
 from datetime import datetime
 from datetime import timedelta
+from datetime import timezone
 
 TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 TIME_FORMAT_WITH_FRAGMENT = re.compile("^(\d{4,4}-\d{2,2}-\d{2,2}T\d{2,2}:\d{2,2}:\d{2,2})\.\d*Z$")
@@ -181,7 +182,8 @@ def time_in_a_while(days=0, seconds=0, microseconds=0, milliseconds=0, minutes=0
     :return: datetime instance using UTC time
     """
     delta = timedelta(days, seconds, microseconds, milliseconds, minutes, hours, weeks)
-    return datetime.utcnow() + delta
+    res = datetime.now(timezone.utc) + delta
+    return res.replace(tzinfo=None)
 
 
 def time_a_while_ago(
@@ -200,7 +202,8 @@ def time_a_while_ago(
     :return: datetime instance using UTC time
     """
     delta = timedelta(days, seconds, microseconds, milliseconds, minutes, hours, weeks)
-    return datetime.utcnow() - delta
+    res = datetime.now(timezone.utc) - delta
+    return res.replace(tzinfo=None)
 
 
 def in_a_while(
@@ -351,7 +354,7 @@ def later_than(after, before):
 
 
 def utc_time_sans_frac():
-    now_timestampt = int(datetime.utcnow().timestamp())
+    now_timestampt = int(datetime.now(timezone.utc).timestamp())
     return now_timestampt