Skip to content

Commit 7e1ae9b

Browse files
committed
merged PCextSequenceBuiltins and PCextNumberBuiltins into PCextAbstractBuiltins
1 parent cf9fe77 commit 7e1ae9b

File tree

4 files changed

+356
-441
lines changed

4 files changed

+356
-441
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@
115115
import com.oracle.graal.python.builtins.modules.cext.PythonCextFloatBuiltins;
116116
import com.oracle.graal.python.builtins.modules.cext.PythonCextListBuiltins;
117117
import com.oracle.graal.python.builtins.modules.cext.PythonCextLongBuiltins;
118-
import com.oracle.graal.python.builtins.modules.cext.PythonCextNumberBuiltins;
119-
import com.oracle.graal.python.builtins.modules.cext.PythonCextSequenceBuiltins;
118+
import com.oracle.graal.python.builtins.modules.cext.PythonCextAbstractBuiltins;
120119
import com.oracle.graal.python.builtins.modules.cext.PythonCextSetBuiltins;
121120
import com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltins;
122121
import com.oracle.graal.python.builtins.modules.csv.CSVDialectBuiltins;
@@ -405,8 +404,7 @@ private static void filterBuiltins(List<PythonBuiltins> builtins) {
405404
}
406405

407406
private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed) {
408-
List<PythonBuiltins> builtins = new ArrayList<>(Arrays.asList(
409-
new BuiltinConstructors(),
407+
List<PythonBuiltins> builtins = new ArrayList<>(Arrays.asList(new BuiltinConstructors(),
410408
new BuiltinFunctions(),
411409
new DecoratedMethodBuiltins(),
412410
new ClassmethodBuiltins(),
@@ -477,15 +475,14 @@ private static PythonBuiltins[] initializeBuiltins(boolean nativeAccessAllowed)
477475
new RandomModuleBuiltins(),
478476
new RandomBuiltins(),
479477
new PythonCextBuiltins(),
478+
new PythonCextAbstractBuiltins(),
480479
new PythonCextBytesBuiltins(),
481480
new PythonCextComplexBuiltins(),
482481
new PythonCextDictBuiltins(),
483482
new PythonCextFloatBuiltins(),
484483
new PythonCextListBuiltins(),
485484
new PythonCextLongBuiltins(),
486-
new PythonCextNumberBuiltins(),
487485
new PythonCextSetBuiltins(),
488-
new PythonCextSequenceBuiltins(),
489486
new PythonCextUnicodeBuiltins(),
490487
new WeakRefModuleBuiltins(),
491488
new ReferenceTypeBuiltins(),

0 commit comments

Comments
 (0)