Skip to content

Commit c0cdb59

Browse files
committed
refactoring: rename _post_init to __builtins_patches__
- rename runPostInit to applyBuiltinsPatches
1 parent c4556eb commit c0cdb59

File tree

5 files changed

+12
-74
lines changed

5 files changed

+12
-74
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
241241
if (!pythonCore.isInitialized()) {
242242
pythonCore.initialize();
243243
}
244-
pythonCore.runPostInit();
244+
pythonCore.loadBuiltinsPatches();
245245
context.getOrCreateMainModule(request.getSource().getPath());
246246

247247
// if we are running the interpreter, module 'site' is automatically imported
@@ -294,7 +294,7 @@ private void parseAndCache(PythonContext context) {
294294

295295
@TruffleBoundary
296296
private Object parseAndEval(PythonContext context, MaterializedFrame frame) {
297-
context.getCore().runPostInit();
297+
context.getCore().loadBuiltinsPatches();
298298
PNode fragment = parseInline(source, context, frame);
299299
return fragment.execute(frame);
300300
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import static com.oracle.graal.python.nodes.BuiltinNames.MODULE;
3030
import static com.oracle.graal.python.nodes.BuiltinNames.OBJECT;
3131
import static com.oracle.graal.python.nodes.BuiltinNames.TYPE;
32+
import static com.oracle.graal.python.nodes.BuiltinNames.__BUILTINS_PATCHES__;
3233
import static com.oracle.graal.python.nodes.SpecialAttributeNames.__PACKAGE__;
3334

3435
import java.io.IOException;
@@ -153,8 +154,6 @@
153154
* {@link PythonContext} has its own core.
154155
*/
155156
public final class Python3Core implements PythonCore {
156-
private static final String POST_INIT_MODULE_NAME = "_post_init";
157-
158157
// Order matters!
159158
private static final String[] CORE_FILES = new String[]{
160159
"_descriptor",
@@ -360,10 +359,10 @@ public void initialize() {
360359
}
361360

362361
@Override
363-
public void runPostInit() {
362+
public void loadBuiltinsPatches() {
364363
if (initialized) {
365364
String coreHome = PythonCore.getCoreHomeOrFail();
366-
loadFile(POST_INIT_MODULE_NAME, coreHome);
365+
loadFile(__BUILTINS_PATCHES__, coreHome);
367366
}
368367
}
369368

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/BuiltinNames.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,17 @@
3939
package com.oracle.graal.python.nodes;
4040

4141
public abstract class BuiltinNames {
42+
// graalpython internals
43+
public static final String __BREAKPOINT__ = "__breakpoint__";
44+
public static final String __BUILTINS_PATCHES__ = "__builtins_patches__";
45+
46+
47+
// cpython internals
4248
public static final String MODULE = "module";
4349
public static final String __BUILD_CLASS__ = "__build_class__";
4450
public static final String __MAIN__ = "__main__";
4551
public static final String __BUILTINS__ = "__builtins__";
4652
public static final String __DEBUG__ = "__debug__";
47-
public static final String __BREAKPOINT__ = "__breakpoint__";
4853

4954
// sys
5055
public static final String EXCEPTHOOK = "excepthook";

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public interface PythonCore {
123123

124124
public PythonContext getContext();
125125

126-
default void runPostInit() {
126+
default void loadBuiltinsPatches() {
127127

128128
}
129129

graalpython/lib-graalpython/_post_init.py

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)