Skip to content

Commit 51c1982

Browse files
committed
Remove ForeignTimeBuiltins and make foreign objects work with TimeBuiltins
1 parent ff608c1 commit 51c1982

5 files changed

Lines changed: 93 additions & 399 deletions

File tree

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@
269269
import com.oracle.graal.python.builtins.objects.foreign.ForeignIterableBuiltins;
270270
import com.oracle.graal.python.builtins.objects.foreign.ForeignNumberBuiltins;
271271
import com.oracle.graal.python.builtins.objects.foreign.ForeignObjectBuiltins;
272-
import com.oracle.graal.python.builtins.objects.foreign.ForeignTimeBuiltins;
273272
import com.oracle.graal.python.builtins.objects.foreign.ForeignTimeZoneBuiltins;
274273
import com.oracle.graal.python.builtins.objects.frame.FrameBuiltins;
275274
import com.oracle.graal.python.builtins.objects.function.AbstractFunctionBuiltins;
@@ -504,7 +503,6 @@ private static PythonBuiltins[] initializeBuiltins(TruffleLanguage.Env env) {
504503
new ForeignNumberBuiltins(),
505504
new ForeignBooleanBuiltins(),
506505
new ForeignDateTimeBuiltins(),
507-
new ForeignTimeBuiltins(),
508506
new ForeignTimeZoneBuiltins(),
509507
new ForeignAbstractClassBuiltins(),
510508
new ForeignExecutableBuiltins(),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@
187187
import com.oracle.graal.python.builtins.objects.foreign.ForeignIterableBuiltins;
188188
import com.oracle.graal.python.builtins.objects.foreign.ForeignNumberBuiltins;
189189
import com.oracle.graal.python.builtins.objects.foreign.ForeignObjectBuiltins;
190-
import com.oracle.graal.python.builtins.objects.foreign.ForeignTimeBuiltins;
191190
import com.oracle.graal.python.builtins.objects.foreign.ForeignTimeZoneBuiltins;
192191
import com.oracle.graal.python.builtins.objects.frame.FrameBuiltins;
193192
import com.oracle.graal.python.builtins.objects.function.AbstractFunctionBuiltins;
@@ -1235,7 +1234,7 @@ def takewhile(predicate, iterable):
12351234

12361235
// foreign datetime
12371236
ForeignDate("ForeignDate", PDate, newBuilder().publishInModule(J_POLYGLOT).basetype().addDict().disallowInstantiation()),
1238-
ForeignTime("ForeignTime", PTime, newBuilder().publishInModule(J_POLYGLOT).basetype().addDict().disallowInstantiation().slots(ForeignTimeBuiltins.SLOTS)),
1237+
ForeignTime("ForeignTime", PTime, newBuilder().publishInModule(J_POLYGLOT).basetype().addDict().disallowInstantiation()),
12391238
ForeignDateTime("ForeignDateTime", PDateTime, newBuilder().publishInModule(J_POLYGLOT).basetype().addDict().disallowInstantiation().slots(ForeignDateTimeBuiltins.SLOTS)),
12401239
ForeignTimeZone("ForeignTimeZone", PTzInfo, newBuilder().publishInModule(J_POLYGLOT).basetype().addDict().disallowInstantiation().slots(ForeignTimeZoneBuiltins.SLOTS)),
12411240

0 commit comments

Comments
 (0)