Merge pull request #71 from jakelishman/fix-deprecated-datetime-methods

Remove use of deprecated `datetime.datetime` methods
testing-cabal · Sep 22, 2023 · 319b70b · 319b70b
2 parents 363fa3c + 0d45488
commit 319b70b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -5,6 +5,9 @@ subunit release notes
 NEXT (In development)
 ---------------------
 
+* Removed use of deprecated "utc" and "utcfromtimestamp"
+  methods of "datetime.datetime".  (Jake Lishman)
+
 1.4.3 (2023-09-17)
 ---------------------
 

diff --git a/python/subunit/test_results.py b/python/subunit/test_results.py
@@ -192,7 +192,7 @@ def _before_event(self):
         time = self._time
         if time is not None:
             return
-        time = datetime.datetime.utcnow().replace(tzinfo=iso8601.UTC)
+        time = datetime.datetime.now(tz=iso8601.UTC)
         self.decorated.time(time)
 
     def progress(self, offset, whence):

diff --git a/python/subunit/v2.py b/python/subunit/v2.py
@@ -46,7 +46,7 @@
 FLAG_MIME_TYPE = 0x0020
 FLAG_EOF = 0x0010
 FLAG_FILE_CONTENT = 0x0040
-EPOCH = datetime.datetime.utcfromtimestamp(0).replace(tzinfo=iso8601.UTC)
+EPOCH = datetime.datetime.fromtimestamp(0, tz=iso8601.UTC)
 NUL_ELEMENT = b'\0'[0]
 # Contains True for types for which 'nul in thing' falsely returns false.
 _nul_test_broken = {}