Fix issue with timestamp timezone (#1740)

* Fix issue with timestamp timezone * Add test
IronLanguages · Sep 9, 2023 · 72f4268 · 72f4268
1 parent e8ed79b
commit 72f4268
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Src/IronPython.Modules/_datetime.cs b/Src/IronPython.Modules/_datetime.cs
@@ -1036,7 +1036,7 @@ public datetime(DateTime dt, tzinfo? tzinfo)
 
             public double timestamp() {
                 if (tzinfo is null) {
-                    return PythonTime.TicksToTimestamp(_dateTime.Ticks);
+                    return PythonTime.TicksToTimestamp(_dateTime.ToUniversalTime().Ticks);
                 }
                 else {
                     return (this - new datetime(new DateTime(1970, 1, 1), timezone.utc)).total_seconds();

diff --git a/Tests/test_datetime.py b/Tests/test_datetime.py
@@ -126,6 +126,11 @@ def test_fromtimestamp(self):
         ts = 5399410716.777882
         self.assertEqual(datetime.datetime.fromtimestamp(ts).microsecond, 777882)
 
+    def test_timestamp(self):
+        # https://github.com/IronLanguages/ironpython3/pull/1740
+        dt = datetime.datetime(2000, 1, 1)
+        self.assertEqual(datetime.datetime.fromtimestamp(dt.timestamp()), dt)
+
     @skipUnlessIronPython()
     def test_System_DateTime_conversion(self):
         import clr