patch 8.1.0247: Python: error message for failing import is incorrect

Problem:    Python: error message for failing import is incorrect.
Solution:   Adjust how modules are loaded. (Ozaki Kiichi, closes #3162)

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 459bc50cddc5cffe58b8b619db2508b1a3300043..cdd7460191ddf2cb1b7e1cb7f9aea970b28039bb 100644 (file)
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -544,27 +544,57 @@ PythonIO_Init_io(void)
 }
 
 #if PY_VERSION_HEX < 0x030700f0
+static PyObject *call_load_module(char *name, int len, PyObject *find_module_result);
+
 typedef struct
 {
     PyObject_HEAD
-    PyObject   *module;
+    char       *fullname;
+    PyObject   *result;
 } LoaderObject;
 static PyTypeObject LoaderType;
 
     static void
 LoaderDestructor(LoaderObject *self)
 {
-    Py_DECREF(self->module);
+    vim_free(self->fullname);
+    Py_XDECREF(self->result);
     DESTRUCTOR_FINISH(self);
 }
 
     static PyObject *
 LoaderLoadModule(LoaderObject *self, PyObject *args UNUSED)
 {
-    PyObject   *ret = self->module;
+    char       *fullname = self->fullname;
+    PyObject   *result = self->result;
+    PyObject   *module;
 
-    Py_INCREF(ret);
-    return ret;
+    if (!fullname)
+    {
+       module = result ? result : Py_None;
+       Py_INCREF(module);
+       return module;
+    }
+
+    module = call_load_module(fullname, (int)STRLEN(fullname), result);
+
+    self->fullname = NULL;
+    self->result = module;
+
+    vim_free(fullname);
+    Py_DECREF(result);
+
+    if (!module)
+    {
+       if (PyErr_Occurred())
+           return NULL;
+
+       Py_INCREF(Py_None);
+       return Py_None;
+    }
+
+    Py_INCREF(module);
+    return module;
 }
 
 static struct PyMethodDef LoaderMethods[] = {
@@ -1252,7 +1282,11 @@ find_module(char *fullname, char *tail, PyObject *new_path)
 
        if (!(find_module_result = PyObject_CallFunction(py_find_module,
                        "s#O", tail, partlen, new_path)))
+       {
+           if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_ImportError))
+               PyErr_Clear();
            return NULL;
+       }
 
        if (!(module = call_load_module(
                        fullname,
@@ -1273,30 +1307,23 @@ find_module(char *fullname, char *tail, PyObject *new_path)
 
        Py_DECREF(module);
 
-       module = find_module(fullname, dot + 1, newest_path);
+       find_module_result = find_module(fullname, dot + 1, newest_path);
 
        Py_DECREF(newest_path);
 
-       return module;
+       return find_module_result;
     }
     else
     {
        if (!(find_module_result = PyObject_CallFunction(py_find_module,
                        "sO", tail, new_path)))
-           return NULL;
-
-       if (!(module = call_load_module(
-                       fullname,
-                       (int)STRLEN(fullname),
-                       find_module_result)))
        {
-           Py_DECREF(find_module_result);
+           if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_ImportError))
+               PyErr_Clear();
            return NULL;
        }
 
-       Py_DECREF(find_module_result);
-
-       return module;
+       return find_module_result;
     }
 }
 
@@ -1304,7 +1331,7 @@ find_module(char *fullname, char *tail, PyObject *new_path)
 FinderFindModule(PyObject *self, PyObject *args)
 {
     char       *fullname;
-    PyObject   *module;
+    PyObject   *result;
     PyObject   *new_path;
     LoaderObject       *loader;
 
@@ -1314,31 +1341,35 @@ FinderFindModule(PyObject *self, PyObject *args)
     if (!(new_path = Vim_GetPaths(self)))
        return NULL;
 
-    module = find_module(fullname, fullname, new_path);
+    result = find_module(fullname, fullname, new_path);
 
     Py_DECREF(new_path);
 
-    if (!module)
+    if (!result)
     {
        if (PyErr_Occurred())
-       {
-           if (PyErr_ExceptionMatches(PyExc_ImportError))
-               PyErr_Clear();
-           else
-               return NULL;
-       }
+           return NULL;
 
        Py_INCREF(Py_None);
        return Py_None;
     }
 
+    if (!(fullname = (char *)vim_strsave((char_u *)fullname)))
+    {
+       Py_DECREF(result);
+       PyErr_NoMemory();
+       return NULL;
+    }
+
     if (!(loader = PyObject_NEW(LoaderObject, &LoaderType)))
     {
-       Py_DECREF(module);
+       vim_free(fullname);
+       Py_DECREF(result);
        return NULL;
     }
 
-    loader->module = module;
+    loader->fullname = fullname;
+    loader->result = result;
 
     return (PyObject *) loader;
 }

diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok
index f8d4ceb577ffd975e5c08da76b2848b1b89184b8..24d3fd4bdeb8ed319253967234dc6b66858eaba9 100644 (file)
--- a/src/testdir/test86.ok
+++ b/src/testdir/test86.ok
@@ -701,7 +701,7 @@ vim.foreach_rtp(FailingCall()):NotImplementedError:('call',)
 vim.foreach_rtp(int, 2):TypeError:('foreach_rtp() takes exactly one argument (2 given)',)
 > import
 import xxx_no_such_module_xxx:ImportError:('No module named xxx_no_such_module_xxx',)
-import failing_import:ImportError:('No module named failing_import',)
+import failing_import:ImportError:()
 import failing:NotImplementedError:()
 > Options
 >> OptionsItem

diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok
index 9ca4b624cffd79f3002b7df5be31552e2ab1c633..a7d4f64264b7966fad3d9ca29cb0c589a0514f5d 100644 (file)
--- a/src/testdir/test87.ok
+++ b/src/testdir/test87.ok
@@ -701,7 +701,7 @@ vim.foreach_rtp(FailingCall()):(<class 'NotImplementedError'>, NotImplementedErr
 vim.foreach_rtp(int, 2):(<class 'TypeError'>, TypeError('foreach_rtp() takes exactly one argument (2 given)',))
 > import
 import xxx_no_such_module_xxx:(<class 'ImportError'>, ImportError('No module named xxx_no_such_module_xxx',))
-import failing_import:(<class 'ImportError'>, ImportError('No module named failing_import',))
+import failing_import:(<class 'ImportError'>, ImportError())
 import failing:(<class 'NotImplementedError'>, NotImplementedError())
 > Options
 >> OptionsItem

diff --git a/src/version.c b/src/version.c
index a3539f0c1e0c48cac97ff99edc6f60e01163778a..95a2e5b432c534916fc89e944d5690415bf6282f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    247,
 /**/
     246,
 /**/