Only register_interop_behavior() for datetime & time when they are imported

* Otherwise just loading polyglot has the heavy cost of loading datetime too.
* This way the interop behavior is defined regardless of whether `import polyglot` was done (without relying on polyglot to be loaded at startup).

(cherry picked from commit 0892329)

Author: eregon

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -49,6 +49,7 @@
 import java.util.List;
 import java.util.TimeZone;
 
+import com.oracle.graal.python.nodes.statement.AbstractImportNode;
 import org.graalvm.nativeimage.ImageInfo;
 
 import com.oracle.graal.python.annotations.ArgumentClinic;
@@ -153,6 +154,7 @@ public final class TimeModuleBuiltins extends PythonBuiltins {
     public static final TruffleString T_DAYLIGHT = tsLiteral("daylight");
     public static final TruffleString T_TIMEZONE = tsLiteral("timezone");
     public static final TruffleString T_ALTZONE = tsLiteral("altzone");
+    public static final TruffleString T_POLYGLOT_TIME = tsLiteral("_polyglot_time");
 
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
@@ -192,6 +194,9 @@ public void postInitialize(Python3Core core) {
         int rawOffsetSeconds = defaultTimeZone.getRawOffset() / -1000;
         timeModule.setAttribute(T_TIMEZONE, rawOffsetSeconds);
         timeModule.setAttribute(T_ALTZONE, rawOffsetSeconds - 3600);
+
+        // register_interop_behavior() for time.struct_time
+        AbstractImportNode.importModule(T_POLYGLOT_TIME);
     }
 
     @TruffleBoundary

graalpython/lib-graalpython/_polyglot.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 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
@@ -37,9 +37,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import datetime
 import polyglot
-import time
 
 
 def interop_type(foreign_class, allow_method_overwrites=False):
@@ -112,37 +110,6 @@ def wrapper(python_class):
 setattr(polyglot, "interop_behavior", interop_behavior)
 
 
-def _date_time_tz(dt: datetime.datetime):
-    if dt.tzinfo is not None:
-        utcoffset = dt.tzinfo.utcoffset(dt)
-        return utcoffset.days * 3600 * 24 + utcoffset.seconds
-    raise polyglot.UnsupportedMessage
-
-
-def _struct_time_tz(st: time.struct_time):
-    if st.tm_gmtoff is not None:
-        return st.tm_gmtoff
-    return st.tm_zone
-
-
-polyglot.register_interop_behavior(datetime.time,
-                                   is_time=True, as_time=lambda d: (d.hour, d.minute, d.second, d.microsecond),
-                                   is_time_zone=lambda t: t.tzinfo is not None, as_time_zone=_date_time_tz)
-
-polyglot.register_interop_behavior(datetime.date,
-                                   is_date=True, as_date=lambda d: (d.year, d.month, d.day))
-
-polyglot.register_interop_behavior(datetime.datetime,
-                                   is_date=True, as_date=lambda d: (d.year, d.month, d.day),
-                                   is_time=True, as_time=lambda d: (d.hour, d.minute, d.second, d.microsecond),
-                                   is_time_zone=lambda t: t.tzinfo is not None, as_time_zone=_date_time_tz)
-
-polyglot.register_interop_behavior(time.struct_time,
-                                   is_date=True, as_date=lambda t: (t.tm_year, t.tm_mon, t.tm_mday),
-                                   is_time=True, as_time=lambda t: (t.tm_hour, t.tm_min, t.tm_sec, 0),
-                                   is_time_zone=lambda t: t.tm_zone is not None or t.tm_gmtoff is not None,
-                                   as_time_zone=_struct_time_tz)
-
 # loading arrow structures on demand
 def __getattr__(name):
     if name == "arrow":
@@ -153,33 +120,3 @@ def __getattr__(name):
 
 setattr(polyglot, "__getattr__", __getattr__)
 setattr(polyglot, "__path__", ".")
-
-# example extending time.struct_time using the decorator wrapper
-#
-# @polyglot.interop_behavior(time.struct_time)
-# class StructTimeInteropBehavior:
-#     @staticmethod
-#     def is_date(t):
-#         return True
-#
-#     @staticmethod
-#     def as_date(t):
-#         return t.tm_year, t.tm_mon, t.tm_mday
-#
-#     @staticmethod
-#     def is_time(t):
-#         return True
-#
-#     @staticmethod
-#     def as_time(t):
-#         return t.tm_hour, t.tm_min, t.tm_sec, 0
-#
-#     @staticmethod
-#     def is_time_zone(t):
-#         return t.tm_zone is not None or t.tm_gmtoff is not None
-#
-#     @staticmethod
-#     def as_time_zone(t):
-#         if t.tm_gmtoff is not None:
-#             return t.tm_gmtoff
-#         return t.tm_zone

graalpython/lib-graalpython/_polyglot_datetime.py

@@ -0,0 +1,60 @@
+# Copyright (c) 2023, 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
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# 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 datetime
+import polyglot
+
+def _date_time_tz(dt: datetime.datetime):
+    if dt.tzinfo is not None:
+        utcoffset = dt.tzinfo.utcoffset(dt)
+        return utcoffset.days * 3600 * 24 + utcoffset.seconds
+    raise polyglot.UnsupportedMessage
+
+
+polyglot.register_interop_behavior(datetime.time,
+                                   is_time=True, as_time=lambda d: (d.hour, d.minute, d.second, d.microsecond),
+                                   is_time_zone=lambda t: t.tzinfo is not None, as_time_zone=_date_time_tz)
+
+polyglot.register_interop_behavior(datetime.date,
+                                   is_date=True, as_date=lambda d: (d.year, d.month, d.day))
+
+polyglot.register_interop_behavior(datetime.datetime,
+                                   is_date=True, as_date=lambda d: (d.year, d.month, d.day),
+                                   is_time=True, as_time=lambda d: (d.hour, d.minute, d.second, d.microsecond),
+                                   is_time_zone=lambda t: t.tzinfo is not None, as_time_zone=_date_time_tz)

graalpython/lib-graalpython/_polyglot_time.py

@@ -0,0 +1,84 @@
+# Copyright (c) 2023, 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
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# 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 polyglot
+
+
+def _struct_time_tz(st: time.struct_time):
+    if st.tm_gmtoff is not None:
+        return st.tm_gmtoff
+    return st.tm_zone
+
+
+polyglot.register_interop_behavior(time.struct_time,
+                                   is_date=True, as_date=lambda t: (t.tm_year, t.tm_mon, t.tm_mday),
+                                   is_time=True, as_time=lambda t: (t.tm_hour, t.tm_min, t.tm_sec, 0),
+                                   is_time_zone=lambda t: t.tm_zone is not None or t.tm_gmtoff is not None,
+                                   as_time_zone=_struct_time_tz)
+
+# example extending time.struct_time using the decorator wrapper
+#
+# @polyglot.interop_behavior(time.struct_time)
+# class StructTimeInteropBehavior:
+#     @staticmethod
+#     def is_date(t):
+#         return True
+#
+#     @staticmethod
+#     def as_date(t):
+#         return t.tm_year, t.tm_mon, t.tm_mday
+#
+#     @staticmethod
+#     def is_time(t):
+#         return True
+#
+#     @staticmethod
+#     def as_time(t):
+#         return t.tm_hour, t.tm_min, t.tm_sec, 0
+#
+#     @staticmethod
+#     def is_time_zone(t):
+#         return t.tm_zone is not None or t.tm_gmtoff is not None
+#
+#     @staticmethod
+#     def as_time_zone(t):
+#         if t.tm_gmtoff is not None:
+#             return t.tm_gmtoff
+#         return t.tm_zone

graalpython/lib-python/3/datetime.py

@@ -2642,3 +2642,5 @@ def _name_from_offset(delta):
     # appropriate to maintain a single module level docstring and
     # remove the following line.
     from _datetime import __doc__
+
+import _polyglot_datetime # GraalPy change: register interop behavior on datetime as soon as datetime is defined