Skip to content

[GR-78546] Fix using UTC timezone from interop before initializing datetime #1069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graalvmbot merged 1 commit into from
Aug 6, 2026
Merged

[GR-78546] Fix using UTC timezone from interop before initializing datetime #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ...om.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/HostInteropTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,12 @@
import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Date;

import org.graalvm.polyglot.Context;
import org.graalvm.polyglot.Value;
Expand Down Expand Up @@ -79,6 +82,15 @@ public void tearDown() {

public static int TEST_FIELD = 32;

@Test
public void testJavaTemporalStrWithoutImportingDatetime() {
Value strFunction = context.eval("python", "str");
assertEquals("1970-01-01 00:00:00+00:00", strFunction.execute(new Date(0)).asString());
assertEquals("1970-01-01 00:00:00+00:00", strFunction.execute(Instant.EPOCH).asString());
ZonedDateTime zonedDateTime = ZonedDateTime.of(2000, 1, 2, 3, 4, 5, 0, ZoneId.of("UTC"));
assertEquals("2000-01-02 03:04:05+00:00", strFunction.execute(zonedDateTime).asString());
}

@Test
public void testStaticMembers() {
int oldValue = TEST_FIELD;
Expand Down
6 changes: 1 addition & 5 deletions ...acle.graal.python/src/com/oracle/graal/python/builtins/modules/datetime/DateBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@
import static com.oracle.graal.python.nodes.BuiltinNames.T_MAX;
import static com.oracle.graal.python.nodes.BuiltinNames.T_MIN;
import static com.oracle.graal.python.nodes.BuiltinNames.T_RESOLUTION;
import static com.oracle.graal.python.nodes.BuiltinNames.T__DATETIME;
import static com.oracle.graal.python.nodes.SpecialMethodNames.J___FORMAT__;
import static com.oracle.graal.python.nodes.SpecialMethodNames.J___REDUCE__;
import static com.oracle.graal.python.nodes.StringLiterals.T_DATE;
import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
import static com.oracle.graal.python.util.PythonUtils.tsLiteral;

Expand Down Expand Up @@ -89,7 +87,6 @@
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
import com.oracle.graal.python.builtins.objects.module.PythonModule;
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
import com.oracle.graal.python.builtins.objects.type.TpSlots;
Expand Down Expand Up @@ -154,10 +151,9 @@ public void postInitialize(Python3Core core) {

PythonLanguage language = core.getLanguage();

PythonModule datetimeModule = core.lookupBuiltinModule(T__DATETIME);
PythonBuiltinClass self = (PythonBuiltinClass) datetimeModule.getAttribute(T_DATE);
final var dateType = PythonBuiltinClassType.PDate;
final var dateShape = dateType.getInstanceShape(language);
PythonBuiltinClass self = core.lookupType(dateType);

final var minDate = new PDate(dateType, dateShape, MIN_YEAR, 1, 1);
self.setAttribute(T_MIN, minDate);
Expand Down
6 changes: 1 addition & 5 deletions ....graal.python/src/com/oracle/graal/python/builtins/modules/datetime/DateTimeBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,11 @@
import static com.oracle.graal.python.nodes.BuiltinNames.T_MAX;
import static com.oracle.graal.python.nodes.BuiltinNames.T_MIN;
import static com.oracle.graal.python.nodes.BuiltinNames.T_RESOLUTION;
import static com.oracle.graal.python.nodes.BuiltinNames.T__DATETIME;
import static com.oracle.graal.python.nodes.ErrorMessages.OBJ_CANNOT_BE_INTERPRETED_AS_INTEGER;
import static com.oracle.graal.python.nodes.ErrorMessages.WARN_DEPRECATED_UTCFROMTIMESTAMP;
import static com.oracle.graal.python.nodes.ErrorMessages.WARN_DEPRECATED_UTCNOW;
import static com.oracle.graal.python.nodes.SpecialMethodNames.J___REDUCE_EX__;
import static com.oracle.graal.python.nodes.SpecialMethodNames.J___REDUCE__;
import static com.oracle.graal.python.nodes.StringLiterals.T_DATETIME;
import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
import static com.oracle.graal.python.util.PythonUtils.tsLiteral;

Expand Down Expand Up @@ -97,7 +95,6 @@
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
import com.oracle.graal.python.builtins.objects.module.PythonModule;
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
import com.oracle.graal.python.builtins.objects.type.TpSlots;
Expand Down Expand Up @@ -178,10 +175,9 @@ public void postInitialize(Python3Core core) {

PythonLanguage language = core.getLanguage();

PythonModule datetimeModule = core.lookupBuiltinModule(T__DATETIME);
PythonBuiltinClass self = (PythonBuiltinClass) datetimeModule.getAttribute(T_DATETIME);
final var dateTimeType = PythonBuiltinClassType.PDateTime;
final var dateTimeShape = dateTimeType.getInstanceShape(language);
PythonBuiltinClass self = core.lookupType(dateTimeType);

final var min = new PDateTime(dateTimeType, dateTimeShape, MIN_YEAR, 1, 1, 0, 0, 0, 0, null, 0);
self.setAttribute(T_MIN, min);
Expand Down
6 changes: 3 additions & 3 deletions ....python/src/com/oracle/graal/python/builtins/modules/datetime/DatetimeModuleBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@

import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ValueError;
import static com.oracle.graal.python.nodes.BuiltinNames.T_TIMEZONE;
import static com.oracle.graal.python.nodes.BuiltinNames.T_UTC;
import static com.oracle.graal.python.nodes.BuiltinNames.T__DATETIME;
import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
Expand Down Expand Up @@ -76,7 +75,8 @@
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.strings.TruffleString;

@CoreFunctions(defineModule = "_datetime")
// Initialized so that the module state is available for host temporal object interop
@CoreFunctions(defineModule = "_datetime", isEager = true)
public class DatetimeModuleBuiltins extends PythonBuiltins {

static final StructSequence.BuiltinTypeDescriptor ISO_CALENDAR_DATE = new StructSequence.BuiltinTypeDescriptor(
Expand Down Expand Up @@ -113,7 +113,7 @@ public void postInitialize(Python3Core core) {
super.postInitialize(core);

PythonModule self = core.lookupBuiltinModule(T__DATETIME);
PythonBuiltinClass timeZoneClass = (PythonBuiltinClass) self.getAttribute(T_TIMEZONE);
PythonBuiltinClass timeZoneClass = core.lookupType(PythonBuiltinClassType.PTimezone);
Object utcObject = timeZoneClass.getAttribute(TimeZoneBuiltins.T_UTC_ATTRIBUTE);

// if by some reason datetime.timezone.utc attribute isn't set yet
Expand Down
6 changes: 1 addition & 5 deletions ...acle.graal.python/src/com/oracle/graal/python/builtins/modules/datetime/TimeBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
import static com.oracle.graal.python.nodes.BuiltinNames.T_MAX;
import static com.oracle.graal.python.nodes.BuiltinNames.T_MIN;
import static com.oracle.graal.python.nodes.BuiltinNames.T_RESOLUTION;
import static com.oracle.graal.python.nodes.BuiltinNames.T_TIME;
import static com.oracle.graal.python.nodes.BuiltinNames.T__DATETIME;
import static com.oracle.graal.python.nodes.SpecialMethodNames.J___FORMAT__;
import static com.oracle.graal.python.nodes.SpecialMethodNames.J___REDUCE_EX__;
import static com.oracle.graal.python.nodes.SpecialMethodNames.J___REDUCE__;
Expand Down Expand Up @@ -75,7 +73,6 @@
import com.oracle.graal.python.builtins.objects.bytes.PBytes;
import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
import com.oracle.graal.python.builtins.objects.module.PythonModule;
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
import com.oracle.graal.python.builtins.objects.type.TpSlots;
Expand Down Expand Up @@ -139,10 +136,9 @@ public void postInitialize(Python3Core core) {

PythonLanguage language = core.getLanguage();

PythonModule datetimeModule = core.lookupBuiltinModule(T__DATETIME);
PythonBuiltinClass self = (PythonBuiltinClass) datetimeModule.getAttribute(T_TIME);
final var timeType = PythonBuiltinClassType.PTime;
final var timeShape = timeType.getInstanceShape(language);
PythonBuiltinClass self = core.lookupType(timeType);

final var min = new PTime(timeType, timeShape, 0, 0, 0, 0, null, 0);
self.setAttribute(T_MIN, min);
Expand Down
5 changes: 1 addition & 4 deletions ...graal.python/src/com/oracle/graal/python/builtins/modules/datetime/TimeDeltaBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import static com.oracle.graal.python.nodes.BuiltinNames.T_MAX;
import static com.oracle.graal.python.nodes.BuiltinNames.T_MIN;
import static com.oracle.graal.python.nodes.BuiltinNames.T_RESOLUTION;
import static com.oracle.graal.python.nodes.BuiltinNames.T__DATETIME;
import static com.oracle.graal.python.nodes.SpecialMethodNames.J___REDUCE__;
import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
Expand All @@ -67,7 +66,6 @@
import com.oracle.graal.python.builtins.objects.PNotImplemented;
import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
import com.oracle.graal.python.builtins.objects.ints.PInt;
import com.oracle.graal.python.builtins.objects.module.PythonModule;
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
import com.oracle.graal.python.builtins.objects.type.TpSlots;
Expand Down Expand Up @@ -131,10 +129,9 @@ public void postInitialize(Python3Core core) {

PythonLanguage language = core.getLanguage();

PythonModule datetimeModule = core.lookupBuiltinModule(T__DATETIME);
PythonBuiltinClass self = (PythonBuiltinClass) datetimeModule.getAttribute(T_TIMEDELTA);
final var timeDeltaType = PythonBuiltinClassType.PTimeDelta;
final var timeDeltaShape = timeDeltaType.getInstanceShape(language);
PythonBuiltinClass self = core.lookupType(timeDeltaType);

final var min = new PTimeDelta(timeDeltaType, timeDeltaShape, -999999999, 0, 0);
self.setAttribute(T_MIN, min);
Expand Down
6 changes: 1 addition & 5 deletions ....graal.python/src/com/oracle/graal/python/builtins/modules/datetime/TimeZoneBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ValueError;
import static com.oracle.graal.python.nodes.BuiltinNames.T_MAX;
import static com.oracle.graal.python.nodes.BuiltinNames.T_MIN;
import static com.oracle.graal.python.nodes.BuiltinNames.T_TIMEZONE;
import static com.oracle.graal.python.nodes.BuiltinNames.T_UTC;
import static com.oracle.graal.python.nodes.BuiltinNames.T__DATETIME;
import static com.oracle.graal.python.nodes.SpecialMethodNames.J___GETINITARGS__;
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___REPR__;
import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
Expand All @@ -65,7 +63,6 @@
import com.oracle.graal.python.builtins.PythonBuiltins;
import com.oracle.graal.python.builtins.objects.PNone;
import com.oracle.graal.python.builtins.objects.PNotImplemented;
import com.oracle.graal.python.builtins.objects.module.PythonModule;
import com.oracle.graal.python.builtins.objects.str.PString;
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
import com.oracle.graal.python.builtins.objects.type.TpSlots;
Expand Down Expand Up @@ -115,12 +112,11 @@ public void postInitialize(Python3Core core) {

PythonLanguage language = core.getLanguage();

PythonModule datetimeModule = core.lookupBuiltinModule(T__DATETIME);
PythonBuiltinClass self = (PythonBuiltinClass) datetimeModule.getAttribute(T_TIMEZONE);
var timeDeltaType = PythonBuiltinClassType.PTimeDelta;
var timeDeltaShape = timeDeltaType.getInstanceShape(language);
var timezoneType = PythonBuiltinClassType.PTimezone;
var timezoneShape = timezoneType.getInstanceShape(language);
PythonBuiltinClass self = core.lookupType(timezoneType);

// -(23 hours, 59 minutes)
var timeDeltaMin = new PTimeDelta(timeDeltaType, timeDeltaShape, -1, 60, 0);
Expand Down
Loading