Replace depreated datetime.datetime.utcnow()

tefra · Dec 18, 2023 · f9b8739 · f9b8739
1 parent 76baf3a
commit f9b8739
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/tests/models/test_datatype.py b/tests/models/test_datatype.py
@@ -223,13 +223,17 @@ def test_datetime_helpers(self):
         now = datetime.now(tz=timezone.utc).replace(microsecond=0, second=0, minute=1)
         self.assertEqual(
             XmlDateTime.from_datetime(now),
-            XmlDateTime.utcnow().replace(fractional_second=0, second=0, minute=1),
+            XmlDateTime.now(timezone.utc).replace(
+                fractional_second=0, second=0, minute=1
+            ),
         )
 
-        now = datetime.utcnow().replace(microsecond=0, second=0, minute=1)
+        now = datetime.now(timezone.utc).replace(microsecond=0, second=0, minute=1)
         self.assertEqual(
             XmlDateTime.from_datetime(now),
-            XmlDateTime.utcnow().replace(fractional_second=0, second=0, minute=1),
+            XmlDateTime.now(timezone.utc).replace(
+                fractional_second=0, second=0, minute=1
+            ),
         )
 
     def test_comparisons(self):
@@ -369,13 +373,13 @@ def test_datetime_helpers(self):
         now = datetime.now(tz=timezone.utc).replace(microsecond=0, second=0, minute=1)
         self.assertEqual(
             XmlTime.from_time(now.time()),
-            XmlTime.utcnow().replace(fractional_second=0, second=0, minute=1),
+            XmlTime.now(timezone.utc).replace(fractional_second=0, second=0, minute=1),
         )
 
-        now = datetime.utcnow().replace(microsecond=0, second=0, minute=1)
+        now = datetime.now(timezone.utc).replace(microsecond=0, second=0, minute=1)
         self.assertEqual(
             XmlTime.from_time(now.time()),
-            XmlTime.utcnow().replace(fractional_second=0, second=0, minute=1),
+            XmlTime.now(timezone.utc).replace(fractional_second=0, second=0, minute=1),
         )
 
     def test_comparisons(self):

diff --git a/xsdata/models/datatype.py b/xsdata/models/datatype.py
@@ -228,8 +228,8 @@ def now(cls, tz: Optional[datetime.timezone] = None) -> "XmlDateTime":
 
     @classmethod
     def utcnow(cls) -> "XmlDateTime":
-        """Initialize from datetime.datetime.utcnow()"""
-        return cls.from_datetime(datetime.datetime.utcnow())
+        """Initialize from datetime.now(timezone.utc)"""
+        return cls.from_datetime(datetime.datetime.now(datetime.timezone.utc))
 
     def to_datetime(self) -> datetime.datetime:
         """Return a :class:`datetime.datetime` instance."""
@@ -411,8 +411,8 @@ def now(cls, tz: Optional[datetime.timezone] = None) -> "XmlTime":
 
     @classmethod
     def utcnow(cls) -> "XmlTime":
-        """Initialize from datetime.datetime.utcnow()"""
-        return cls.from_time(datetime.datetime.utcnow().time())
+        """Initialize from datetime.now(timezone.utc)"""
+        return cls.from_time(datetime.datetime.now(datetime.timezone.utc).time())
 
     def to_time(self) -> datetime.time:
         """Return a :class:`datetime.time` instance."""