| To: vim-dev@vim.org |
| Subject: Patch 7.2.045 |
| Fcc: outbox |
| From: Bram Moolenaar <Bram@moolenaar.net> |
| Mime-Version: 1.0 |
| Content-Type: text/plain; charset=ISO-8859-1 |
| Content-Transfer-Encoding: 8bit |
| |
| |
| Patch 7.2.045 |
| Problem: The Python interface has an empty entry in sys.path. |
| Solution: Filter out the empty entry. (idea from James Vega) |
| Files: src/if_python.c |
| |
| |
| |
| |
| |
| *** 531,536 **** |
| --- 531,542 ---- |
| if (PythonMod_Init()) |
| goto fail; |
| |
| + /* Remove the element from sys.path that was added because of our |
| + * argv[0] value in PythonMod_Init(). Previously we used an empty |
| + * string, but dependinding on the OS we then get an empty entry or |
| + * the current directory in sys.path. */ |
| + PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)"); |
| + |
| /* the first python thread is vim's, release the lock */ |
| Python_SaveThread(); |
| |
| |
| *** 2345,2351 **** |
| { |
| PyObject *mod; |
| PyObject *dict; |
| ! static char *(argv[2]) = {"", NULL}; |
| |
| /* Fixups... */ |
| BufferType.ob_type = &PyType_Type; |
| --- 2351,2358 ---- |
| { |
| PyObject *mod; |
| PyObject *dict; |
| ! /* The special value is removed from sys.path in Python_Init(). */ |
| ! static char *(argv[2]) = {"/must>not&exist/foo", NULL}; |
| |
| /* Fixups... */ |
| BufferType.ob_type = &PyType_Type; |
| |
| |
| |
| *** 678,679 **** |
| --- 678,681 ---- |
| { /* Add new patch number below this line */ |
| + /**/ |
| + 45, |
| /**/ |
| |
| -- |
| press CTRL-ALT-DEL for more information |
| |
| /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| \\\ download, build and distribute -- http://www.A-A-P.org /// |
| \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |