Merge pull request #1940 from dcherednik/importlib

Library import 14

1 files changed, 13 insertions, 10 deletions

diff --git a/contrib/tools/python3/src/Python/importdl.c b/contrib/tools/python3/src/Python/importdl.c
index 870ae273007..3a3a30ddbdc 100644
--- a/contrib/tools/python3/src/Python/importdl.c
+++ b/contrib/tools/python3/src/Python/importdl.c
@@ -3,6 +3,7 @@
 
 #include "Python.h"
 #include "pycore_call.h"
+#include "pycore_import.h"
 #include "pycore_pystate.h"
 #include "pycore_runtime.h"
 
@@ -99,7 +100,7 @@ _PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *fp)
 #endif
     PyObject *name_unicode = NULL, *name = NULL, *path = NULL, *m = NULL;
     const char *name_buf, *hook_prefix;
-    const char *oldcontext;
+    const char *oldcontext, *newcontext;
     dl_funcptr exportfunc;
     PyModuleDef *def;
     PyModInitFunction p0;
@@ -113,6 +114,10 @@ _PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *fp)
                         "spec.name must be a string");
         goto error;
     }
+    newcontext = PyUnicode_AsUTF8(name_unicode);
+    if (newcontext == NULL) {
+        goto error;
+    }
 
     name = get_encoded_name(name_unicode, &hook_prefix);
     if (name == NULL) {
@@ -160,14 +165,9 @@ _PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *fp)
     p0 = (PyModInitFunction)exportfunc;
 
     /* Package context is needed for single-phase init */
-    oldcontext = _Py_PackageContext;
-    _Py_PackageContext = PyUnicode_AsUTF8(name_unicode);
-    if (_Py_PackageContext == NULL) {
-        _Py_PackageContext = oldcontext;
-        goto error;
-    }
+    oldcontext = _PyImport_SwapPackageContext(newcontext);
     m = _PyImport_InitFunc_TrampolineCall(p0);
-    _Py_PackageContext = oldcontext;
+    _PyImport_SwapPackageContext(oldcontext);
 
     if (m == NULL) {
         if (!PyErr_Occurred()) {
@@ -178,8 +178,7 @@ _PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *fp)
         }
         goto error;
     } else if (PyErr_Occurred()) {
-        PyErr_Clear();
-        PyErr_Format(
+        _PyErr_FormatFromCause(
             PyExc_SystemError,
             "initialization of %s raised unreported exception",
             name_buf);
@@ -205,6 +204,10 @@ _PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *fp)
 
     /* Fall back to single-phase init mechanism */
 
+    if (_PyImport_CheckSubinterpIncompatibleExtensionAllowed(name_buf) < 0) {
+        goto error;
+    }
+
     if (hook_prefix == nonascii_prefix) {
         /* don't allow legacy init for non-ASCII module names */
         PyErr_Format(