add various functions around PyImport_AddModule

Author: timfel

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

@@ -45,3 +45,33 @@ PyObject* PyImport_ImportModule(const char *name) {
 PyObject* PyImport_GetModuleDict() {
     return UPCALL_CEXT_O("PyImport_GetModuleDict");
 }
+
+PyObject* PyImport_AddModuleObject(PyObject *name) {
+    return _PyImport_AddModuleObject(name, PyImport_GetModuleDict());
+}
+
+PyObject* PyImport_AddModule(const char *name) {
+    PyObject *nameobj = PyUnicode_FromString(name);
+    if (nameobj == NULL) {
+        return NULL;
+    }
+    return PyImport_AddModuleObject(nameobj);
+}
+
+PyObject* _PyImport_AddModuleObject(PyObject *name, PyObject *modules) {
+    PyObject* m = PyObject_GetItem(modules, name);
+    if (PyErr_Occurred()) {
+        return NULL;
+    }
+    if (m != NULL && PyModule_Check(m)) {
+        return m;
+    }
+    m = PyModule_NewObject(name);
+    if (m == NULL) {
+        return NULL;
+    }
+    if (PyObject_SetItem(modules, name, m) != 0) {
+        return NULL;
+    }
+    return m;
+}

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

@@ -123,3 +123,7 @@ PyObject* PyModule_GetDict(PyObject* o) {
     }
     return ((PyModuleObject*)o)->md_dict;
 }
+
+PyObject* PyModule_NewObject(PyObject* name) {
+    return UPCALL_CEXT_O("PyModule_New", name);
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java

@@ -264,6 +264,12 @@ Object getItem(PDict self, Object key,
     @Builtin(name = __MISSING__, fixedNumOfArguments = 2)
     @GenerateNodeFactory
     public abstract static class MissingNode extends PythonBuiltinNode {
+        @SuppressWarnings("unused")
+        @Specialization
+        Object run(Object self, PString key) {
+            throw raise(KeyError, "%s", key.getValue());
+        }
+
         @SuppressWarnings("unused")
         @Specialization
         Object run(Object self, String key) {

graalpython/lib-graalpython/python_cext.py

@@ -104,6 +104,10 @@ def PyModule_SetDocString(module, string):
     module.__doc__ = string
 
 
+def PyModule_NewObject(name):
+    return moduletype(name)
+
+
 ##################### DICT
 
 def PyDict_New():