Remove usages of deprecated datetime.utcnow() and datetime.utcfromtimestamp()

rest_framework_simplejwt/utils.py

@@ -23,15 +23,23 @@ def make_utc(dt: datetime) -> datetime:
 
 
 def aware_utcnow() -> datetime:
-    return make_utc(datetime.utcnow())
+    dt = datetime.now(tz=timezone.utc)
+    if not settings.USE_TZ:
+        dt = dt.replace(tzinfo=None)
+
+    return dt
 
 
 def datetime_to_epoch(dt: datetime) -> int:
     return timegm(dt.utctimetuple())
 
 
 def datetime_from_epoch(ts: float) -> datetime:
-    return make_utc(datetime.utcfromtimestamp(ts))
+    dt = datetime.fromtimestamp(ts, tz=timezone.utc)
+    if not settings.USE_TZ:
+        dt = dt.replace(tzinfo=None)
+
+    return dt
 
 
 def format_lazy(s: str, *args, **kwargs) -> str:

setup.py

@@ -6,6 +6,7 @@
 extras_require = {
     "test": [
         "cryptography",
+        "freezegun",
         "pytest-cov",
         "pytest-django",
         "pytest-xdist",

tests/test_utils.py

@@ -1,8 +1,8 @@
 from datetime import datetime, timedelta
-from unittest.mock import patch
 
 from django.test import TestCase
 from django.utils import timezone
+from freezegun import freeze_time
 
 from rest_framework_simplejwt.utils import (
     aware_utcnow,
@@ -34,11 +34,9 @@ def test_it_should_return_the_correct_values(self):
 
 class TestAwareUtcnow(TestCase):
     def test_it_should_return_the_correct_value(self):
-        now = datetime.utcnow()
-
-        with patch("rest_framework_simplejwt.utils.datetime") as fake_datetime:
-            fake_datetime.utcnow.return_value = now
+        now = datetime.now(tz=timezone.utc).replace(tzinfo=None)
 
+        with freeze_time(now):
             # Should return aware utcnow if USE_TZ == True
             with self.settings(USE_TZ=True):
                 self.assertEqual(