Patch 8.1.1361
Problem: Python setuptools don't work with Python 3.
Solution: Add dummy implementation for find_module. (Joel Frederico,
closes #4402, closes #3984
Files: src/if_py_both.h
*** ../vim-8.1.1360/src/if_py_both.h 2019-05-18 15:02:20.966415938 +0200
--- src/if_py_both.h 2019-05-20 21:49:15.800074593 +0200
***************
*** 1222,1227 ****
--- 1222,1235 ----
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,1408 ****
{"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
- {"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}
--- 1408,1415 ----
{"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"},
#endif
+ {"find_module", FinderFindModule, METH_VARARGS,
"Internal use only, returns loader object for any input it receives"},
{"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}
*** ../vim-8.1.1360/src/version.c 2019-05-20 20:34:48.347791448 +0200
--- src/version.c 2019-05-20 21:50:57.403502707 +0200
***************
*** 769,770 ****
--- 769,772 ----
{ /* Add new patch number below this line */
+ /**/
+ 1361,
/**/
--
A)bort, R)etry, B)ang it with a large hammer
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/201905201953.x4KJr5bn020708%40masaka.moolenaar.net.
For more options, visit https://groups.google.com/d/optout.
