set constants of builtin modules where we should

Author: timfel

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

@@ -195,11 +195,6 @@ public final class Python3Core implements PythonCore {
                     "_locale",
     };
 
-    private static final Map<String, Object> BUILTIN_CONSTANTS = new HashMap<>();
-    static {
-        BUILTIN_CONSTANTS.put("NotImplemented", PNotImplemented.NOT_IMPLEMENTED);
-    }
-
     private final PythonBuiltins[] BUILTINS = new PythonBuiltins[]{
                     new BuiltinConstructors(),
                     new BuiltinFunctions(),
@@ -345,7 +340,6 @@ public void bootstrap() {
         publishBuiltinModules();
 
         builtinsModule = builtinModules.get("builtins");
-        setBuiltinsConstants();
     }
 
     @Override
@@ -600,12 +594,6 @@ private void publishBuiltinModules() {
         }
     }
 
-    private void setBuiltinsConstants() {
-        for (Entry<String, Object> entry : BUILTIN_CONSTANTS.entrySet()) {
-            builtinsModule.setAttribute(entry.getKey(), entry.getValue());
-        }
-    }
-
     public void exportCInterface(PythonContext context) {
         Env env = context.getEnv();
         if (env != null) {

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

@@ -145,6 +145,7 @@
 import com.oracle.graal.python.nodes.subscript.SliceLiteralNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.runtime.JavaTypeConversions;
+import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.sequence.PSequence;
@@ -170,6 +171,12 @@ protected List<com.oracle.truffle.api.dsl.NodeFactory<? extends PythonBuiltinBas
         return BuiltinConstructorsFactory.getFactories();
     }
 
+    @Override
+    public void initialize(PythonCore core) {
+        super.initialize(core);
+        builtinConstants.put("NotImplemented", PNotImplemented.NOT_IMPLEMENTED);
+    }
+
     // bytes([source[, encoding[, errors]]])
     @Builtin(name = BYTES, minNumOfArguments = 1, maxNumOfArguments = 4, constructsClass = PBytes.class)
     @GenerateNodeFactory