1 files changed, 44 insertions, 20 deletions

diff --git a/Python/importdl.c b/Python/importdl.c
index 14c9be8..9caed45 100644
--- a/Python/importdl.c
+++ b/Python/importdl.c
@@ -22,12 +22,21 @@ PyObject *
 _PyImport_LoadDynamicModule(char *name, char *pathname, FILE *fp)
 {
     PyObject *m;
+    PyObject *path;
     char *lastdot, *shortname, *packagecontext, *oldcontext;
-    dl_funcptr p;
+    dl_funcptr p0;
+    PyObject* (*p)(void);
+    struct PyModuleDef *def;
+    PyObject *result;
 
-    if ((m = _PyImport_FindExtension(name, pathname)) != NULL) {
+    path = PyUnicode_DecodeFSDefault(pathname);
+    if (path == NULL)
+        return NULL;
+
+    if ((m = _PyImport_FindExtensionUnicode(name, path)) != NULL) {
         Py_INCREF(m);
-        return m;
+        result = m;
+        goto finally;
     }
     lastdot = strrchr(name, '.');
     if (lastdot == NULL) {
@@ -39,40 +48,55 @@ _PyImport_LoadDynamicModule(char *name, char *pathname, FILE *fp)
         shortname = lastdot+1;
     }
 
-    p = _PyImport_GetDynLoadFunc(name, shortname, pathname, fp);
+    p0 = _PyImport_GetDynLoadFunc(name, shortname, pathname, fp);
+    p = (PyObject*(*)(void))p0;
     if (PyErr_Occurred())
-        return NULL;
+        goto error;
     if (p == NULL) {
         PyErr_Format(PyExc_ImportError,
-           "dynamic module does not define init function (init%.200s)",
+           "dynamic module does not define init function (PyInit_%.200s)",
                      shortname);
-        return NULL;
+        goto error;
     }
     oldcontext = _Py_PackageContext;
     _Py_PackageContext = packagecontext;
-    (*p)();
+    m = (*p)();
     _Py_PackageContext = oldcontext;
-    if (PyErr_Occurred())
-        return NULL;
+    if (m == NULL)
+        goto error;
 
-    m = PyDict_GetItemString(PyImport_GetModuleDict(), name);
-    if (m == NULL) {
-        PyErr_SetString(PyExc_SystemError,
-                        "dynamic module not initialized properly");
-        return NULL;
+    if (PyErr_Occurred()) {
+        Py_DECREF(m);
+        PyErr_Format(PyExc_SystemError,
+                     "initialization of %s raised unreported exception",
+                     shortname);
+        goto error;
     }
+
+    /* Remember pointer to module init function. */
+    def = PyModule_GetDef(m);
+    def->m_base.m_init = p;
+
     /* Remember the filename as the __file__ attribute */
-    if (PyModule_AddStringConstant(m, "__file__", pathname) < 0)
+    if (PyModule_AddObject(m, "__file__", path) < 0)
         PyErr_Clear(); /* Not important enough to report */
+    else
+        Py_INCREF(path);
 
-    if (_PyImport_FixupExtension(name, pathname) == NULL)
-        return NULL;
+    if (_PyImport_FixupExtensionUnicode(m, name, path) < 0)
+        goto error;
     if (Py_VerboseFlag)
         PySys_WriteStderr(
             "import %s # dynamically loaded from %s\n",
             name, pathname);
-    Py_INCREF(m);
-    return m;
+    result = m;
+    goto finally;
+
+error:
+    result = NULL;
+finally:
+    Py_DECREF(path);
+    return result;
 }
 
 #endif /* HAVE_DYNAMIC_LOADING */