# HG changeset patch # User Bram Moolenaar # Date 1558382405 -7200 # Node ID 9aa87f5aab551a0c586ef5cdc4b6e7dcc6660ed8 # Parent 94be3f45281f5c0d5f9294acfbb8e94a825058be patch 8.1.1361: Python setuptools don't work with Python 3 commit https://github.com/vim/vim/commit/0b0ad35c339b8ad156df493bebeb77e02b32b120 Author: Bram Moolenaar Date: Mon May 20 21:52:45 2019 +0200 patch 8.1.1361: Python setuptools don't work with Python 3 Problem: Python setuptools don't work with Python 3. Solution: Add dummy implementation for find_module. (Joel Frederico, closes #4402, closes #3984 diff --git a/src/if_py_both.h b/src/if_py_both.h --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -1222,6 +1222,14 @@ FinderFindSpec(PyObject *self, PyObject return spec; } + + static PyObject * +FinderFindModule(PyObject* self UNUSED, PyObject* args UNUSED) +{ + // Apparently returning None works. + Py_INCREF(Py_None); + return Py_None; +} #else static PyObject * call_load_module(char *name, int len, PyObject *find_module_result) @@ -1400,9 +1408,8 @@ static struct PyMethodDef VimMethods[] = {"foreach_rtp", VimForeachRTP, METH_O, "Call given callable for each path in &rtp"}, #if PY_VERSION_HEX >= 0x030700f0 {"find_spec", FinderFindSpec, METH_VARARGS, "Internal use only, returns spec object for any input it receives"}, -#else +#endif {"find_module", FinderFindModule, METH_VARARGS, "Internal use only, returns loader object for any input it receives"}, -#endif {"path_hook", VimPathHook, METH_VARARGS, "Hook function to install in sys.path_hooks"}, {"_get_paths", (PyCFunction)Vim_GetPaths, METH_NOARGS, "Get &rtp-based additions to sys.path"}, { NULL, NULL, 0, NULL} diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1361, +/**/ 1360, /**/ 1359,