[GR-68653] Fix setting time.tzname when the timezone has no DST

PullRequest: graalpython/3950

Author: msimacek

.github/workflows/downstream-tests.yml

@@ -14,6 +14,7 @@ jobs:
         - virtualenv
         - pyo3
         - pydantic-core
+        - jiter
         os:
         - id: ubuntu-latest
           platform: linux
@@ -36,7 +37,7 @@ jobs:
       run: brew install cmake
 
     - name: Install Rust toolchain
-      if: ${{ matrix.name == 'pyo3' || matrix.name == 'pydantic-core' }}
+      if: ${{ matrix.name == 'pyo3' || matrix.name == 'pydantic-core' || matrix.name == 'jiter' }}
       run: |
         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
         echo "${HOME}/.cargo/bin" >> $GITHUB_PATH

ci.jsonnet

@@ -502,7 +502,7 @@
     ) + [
         {
             name: "graalpy-website-build",
-            targets: ["gate"],
+            targets: ["tier1"],
             guard: {
                 includes: ["docs/user/**", "docs/site/**"],
             },

graalpython/com.oracle.graal.python.test/src/tests/test_time.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -36,10 +36,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-
-import time
 import calendar
+import os
+import subprocess
+import sys
+import time
 import unittest
+from textwrap import dedent
+
 
 def test_sleep():
     start = time.time()
@@ -72,19 +76,19 @@ def test_new_struct_time(self):
         self.assertEqual(t.tm_mday, 26)
         self.assertEqual(t[2], 26)
         self.assertEqual(t.tm_zone, None)
-        
+
         self.assertRaises(TypeError, time.struct_time, (2018, 11, 26, 17, 34, 12, 0, 340))
         self.assertRaises(TypeError, time.struct_time, (2018, 11, 26, 17, 34, 12, 0, 340, 9, 10, 11, 12))
 
     def test_from_times(self):
         gt = time.gmtime()
         self.assertNotEqual(gt.tm_zone, None)
         self.assertNotEqual(gt.tm_gmtoff, None)
-        
+
         lt = time.localtime()
         self.assertNotEqual(lt.tm_zone, None)
         self.assertNotEqual(lt.tm_gmtoff, None)
-        
+
     def test_destructuring_assignment(self):
         t = time.struct_time((1,2,3,4,5,6,7,8,9))
         y,m,d,h,mi,s,wd,yd,dst = t
@@ -93,7 +97,7 @@ def test_destructuring_assignment(self):
         self.assertEqual(dst, 9)
         self.assertEqual(t.tm_zone, None)
         self.assertEqual(t.tm_gmtoff, None)
-        
+
         t = time.struct_time((11,12,13,14,15,16,17,18,19,20, 21))
         y,m,d,h,mi,s,wd,yd,dst = t
         self.assertEqual(y, 11)
@@ -234,7 +238,7 @@ def test_Yeary(self):
         self.check_format("%y", (2018, 11, 28, 10, 0, 0, -1, 1, 0), '18')
         self.check_format("%y", (18, 11, 28, 10, 0, 0, 0, 1, 0), '18')
         self.check_format("%y", (0, 11, 25, 11, 12, 2, 3, 1, 0), '00')
-        # This is failing on CPython, which return '35' 
+        # This is failing on CPython, which return '35'
         #self.check_format("%y", (-365, 11, 24, 23, 20, 61, 6, 1, 0), '65')
         self.check_format("%y", (17829, 11, 24, 23, 20, 61, 7, 1, 0), '29')
 
@@ -280,3 +284,28 @@ def test_padding(self):
         self.check_format("%Y-%b-%d-%j", (2018, 8, 8, 15, 24, 10, 3, 55, 0), '2018-Aug-08-055')
         self.check_format("%Y-%b-%-d-%-j", (2018, 8, 8, 15, 24, 10, 3, 5, 0), '2018-Aug-8-5')
         self.check_format("%Y-%b-%-d-%-j", (2018, 8, 8, 15, 24, 10, 3, 55, 0), '2018-Aug-8-55')
+
+    @unittest.skipIf(sys.platform == 'win32', "Cannot change timezone per-process on Windows")
+    def test_default_tz_dst_no_dst(self):
+        env = os.environ.copy()
+        testdate = '1994-11-15 12:45:26'
+        for tz, expected in [
+            ('UTC', f"tzname=('UTC', 'UTC'), timezone=0, altzone=0, daylight=0, testdate={testdate}"),
+            ('Europe/Prague', f"tzname=('CET', 'CEST'), timezone=-3600, altzone=-7200, daylight=1, testdate={testdate}"),
+            ('Australia/Sydney', f"tzname=('AEST', 'AEDT'), timezone=-36000, altzone=-39600, daylight=1, testdate={testdate}"),
+        ]:
+            env['TZ'] = tz
+            env['LC_ALL'] = 'C'
+            script = dedent('''\
+                from time import *
+                from datetime import datetime
+                # Regression test for issue #532
+                testdate = datetime.strptime('Tue, 15 Nov 1994 12:45:26 GMT', '%a, %d %b %Y %H:%M:%S %Z')
+                print(f'{tzname=}, {timezone=}, {altzone=}, {daylight=}, {testdate=!s}')
+                ''')
+            out = subprocess.check_output(
+                [sys.executable, '-c', script],
+                env=env,
+                text=True,
+            ).strip()
+            self.assertEqual(expected, out)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TimeModuleBuiltins.java

@@ -174,17 +174,10 @@ public void postInitialize(Python3Core core) {
         TruffleString noDaylightSavingZone = toTruffleStringUncached(defaultTimeZone.getDisplayName(false, TimeZone.SHORT));
         TruffleString daylightSavingZone = toTruffleStringUncached(defaultTimeZone.getDisplayName(true, TimeZone.SHORT));
 
-        boolean hasDaylightSaving = !noDaylightSavingZone.equalsUncached(daylightSavingZone, TS_ENCODING);
-        if (hasDaylightSaving) {
-            timeModule.setAttribute(T_TZNAME, PFactory.createTuple(core.getLanguage(), new Object[]{noDaylightSavingZone, daylightSavingZone}));
-        } else {
-            timeModule.setAttribute(T_TZNAME, PFactory.createTuple(core.getLanguage(), new Object[]{noDaylightSavingZone}));
-        }
-
-        timeModule.setAttribute(T_DAYLIGHT, PInt.intValue(hasDaylightSaving));
-        int rawOffsetSeconds = defaultTimeZone.getRawOffset() / -1000;
-        timeModule.setAttribute(T_TIMEZONE, rawOffsetSeconds);
-        timeModule.setAttribute(T_ALTZONE, rawOffsetSeconds - 3600);
+        timeModule.setAttribute(T_TZNAME, PFactory.createTuple(core.getLanguage(), new Object[]{noDaylightSavingZone, daylightSavingZone}));
+        timeModule.setAttribute(T_DAYLIGHT, PInt.intValue(defaultTimeZone.getDSTSavings() != 0));
+        timeModule.setAttribute(T_TIMEZONE, defaultTimeZone.getRawOffset() / -1000);
+        timeModule.setAttribute(T_ALTZONE, (defaultTimeZone.getRawOffset() + defaultTimeZone.getDSTSavings()) / -1000);
 
         // register_interop_behavior() for time.struct_time
         AbstractImportNode.importModule(T_POLYGLOT_TIME);

mx.graalpython/downstream_tests.py

@@ -158,6 +158,19 @@ def downstream_test_pydantic_core(graalpy, testdir):
     run(['uv', 'run', 'pytest', '-v', '--tb=short'], cwd=src)
 
 
+@downstream_test('jiter')
+def downstream_test_jiter(graalpy, testdir):
+    run(['git', 'clone', 'https://github.com/pydantic/jiter.git', '-b', 'main'], cwd=testdir)
+    src = testdir / 'jiter'
+    venv = src / 'venv'
+    run([graalpy, '-m', 'venv', str(venv)])
+    run_in_venv(venv, ['pip', 'install', '-r', 'crates/jiter-python/tests/requirements.txt'], cwd=src)
+    run_in_venv(venv, ['pip', 'install', '-e', 'crates/jiter-python',
+                       '--config-settings=build-args=--profile dev'], cwd=src)
+    run_in_venv(venv, ['pytest', '-v', '--tb=short', 'crates/jiter-python/tests'], cwd=src)
+    run_in_venv(venv, ['python', 'crates/jiter-python/bench.py', 'jiter', 'jiter-cache', '--fast'], cwd=src)
+
+
 def run_downstream_test(python, project):
     testdir = Path('upstream-tests').absolute()
     shutil.rmtree(testdir, ignore_errors=True)