python
diff --git a/‎Lib/test/datetimetester.py
Copy file name to clipboardExpand all lines: Lib/test/datetimetester.py
+29-3Lines changed: 29 additions & 3 deletions b/‎Lib/test/datetimetester.py
Copy file name to clipboardExpand all lines: Lib/test/datetimetester.py
+29-3Lines changed: 29 additions & 3 deletions
@@ -57,6 +57,33 @@
 NAN = float("nan")
 
 
+def _utcfromtimestamp(klass, ts):
+    """Simple re-implementation of datetime.utcfromtimestamp.
+
+    utcfromtimestamp is deprecated because it returns a naïve datetime object
+    despite being aware that it is UTC. This sort of deliberately wrong object
+    happens to be useful when calculating transition times from a TZif file,
+    so this is a re-implementation of that.
+    """
+    ats = abs(ts)
+    sign = int(ts / ats)
+
+    ts, frac = divmod(ats, 1.)
+    ts *= sign
+    frac *= sign
+
+    us = round(frac * 1e6)
+    if us >= 1000000:
+        ts += 1
+        us -= 1000000
+    elif us < 0:
+        ts -= 1
+        us += 1000000
+
+    y, m, d, hh, mm, ss, *_ = _time.gmtime(ts)
+
+    return klass(y, m, d, hh, mm, ss, us)
+
 #############################################################################
 # module tests
 
@@ -6098,15 +6125,14 @@ def stats(cls, start_year=1):
     def transitions(self):
         for (_, prev_ti), (t, ti) in pairs(zip(self.ut, self.ti)):
             shift = ti[0] - prev_ti[0]
-            # TODO: Remove this use of utcfromtimestamp
-            yield datetime.utcfromtimestamp(t), shift
+            yield _utcfromtimestamp(datetime, t), shift
 
     def nondst_folds(self):
         """Find all folds with the same value of isdst on both sides of the transition."""
         for (_, prev_ti), (t, ti) in pairs(zip(self.ut, self.ti)):
             shift = ti[0] - prev_ti[0]
             if shift < ZERO and ti[1] == prev_ti[1]:
-                yield datetime.utcfromtimestamp(t), -shift, prev_ti[2], ti[2]
+                yield _utcfromtimestamp(datetime, t,), -shift, prev_ti[2], ti[2]
 
     @classmethod
     def print_all_nondst_folds(cls, same_abbr=False, start_year=1):