[GR-14721] Don't use polyglot namespace for C API.

PullRequest: graalpython/459

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -59,8 +59,8 @@ cache_t cache;
 
 __attribute__((constructor (__COUNTER__)))
 static void initialize_upcall_functions() {
-    PY_TRUFFLE_CEXT = (void*)polyglot_import("python_cext");
-    PY_BUILTIN = (void*)polyglot_import("python_builtins");
+    PY_TRUFFLE_CEXT = (void*)polyglot_eval("python", "import python_cext\npython_cext");
+    PY_BUILTIN = (void*)polyglot_eval("python", "import builtins\nbuiltins");
 
     PY_TRUFFLE_LANDING = ((PyObject*(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall", SRC_CS)));
     PY_TRUFFLE_LANDING_L = ((PyObject*(*)(void *rcv, void* name, ...))polyglot_get_member(PY_TRUFFLE_CEXT, polyglot_from_string("PyTruffle_Upcall_l", SRC_CS)));

graalpython/com.oracle.graal.python.test/src/tests/test_interop.py

@@ -43,9 +43,17 @@
     import polyglot
 
     def test_import():
-        imported_cext = polyglot.import_value("python_cext")
-        import python_cext
-        assert imported_cext is python_cext
+        def some_function():
+            return "hello, polyglot world!"
+        polyglot.export_value(some_function)
+        imported_fun0 = polyglot.import_value("some_function")
+        assert imported_fun0 is some_function
+        assert imported_fun0() == "hello, polyglot world!"
+
+        polyglot.export_value(some_function, "same_function")
+        imported_fun1 = polyglot.import_value("same_function")
+        assert imported_fun1 is some_function
+        assert imported_fun1() == "hello, polyglot world!"
 
     class GetterOnly():
         def __get__(self, instance, owner):

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

@@ -421,7 +421,6 @@ private void initializePythonCore() {
         for (String s : coreFiles) {
             loadFile(s, coreHome);
         }
-        exportCInterface(getContext());
         initialized = true;
     }
 
@@ -480,20 +479,6 @@ private void publishBuiltinModules() {
         }
     }
 
-    public void exportCInterface(PythonContext context) {
-        Env env = context.getEnv();
-        if (env != null) {
-            env.exportSymbol(TruffleCextBuiltins.PYTHON_CEXT, builtinModules.get(TruffleCextBuiltins.PYTHON_CEXT));
-            env.exportSymbol("python_builtins", builtinsModule);
-
-            // export all exception classes for the C API
-            for (PythonBuiltinClassType errorType : PythonBuiltinClassType.EXCEPTIONS) {
-                PythonBuiltinClass errorClass = lookupType(errorType);
-                env.exportSymbol("python_" + GetNameNode.doSlowPath(errorClass), errorClass);
-            }
-        }
-    }
-
     private PythonBuiltinClass initializeBuiltinClass(PythonBuiltinClassType type) {
         int index = type.ordinal();
         if (builtinTypes[index] == null) {

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

@@ -51,6 +51,7 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
@@ -257,6 +258,11 @@ public Object exportSymbol(PBuiltinMethod fun, @SuppressWarnings("unused") PNone
             return fun;
         }
 
+        @Fallback
+        public Object exportSymbol(Object value, Object name) {
+            throw raise(PythonBuiltinClassType.TypeError, "expected argument types (function) or (object, str) but not (%p, %p)", value, name);
+        }
+
         private String getMethodName(Object o) {
             if (getNameAttributeNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();