Patch 8.0.1846
Problem: Python interface is incompatible with lldb.
Solution: For OutputType set the base to be PyFile_Type. (Boxu Zhang)
Partly disabled to avoid a crash.
Files: src/if_py_both.h, src/if_python.c, src/if_python3.c
*** ../vim-8.0.1845/src/if_py_both.h 2018-02-27 17:25:48.020151886 +0100
--- src/if_py_both.h 2018-05-15 22:30:34.732705012 +0200
***************
*** 6333,6341 ****
--- 6333,6344 ----
OutputType.tp_alloc = call_PyType_GenericAlloc;
OutputType.tp_new = call_PyType_GenericNew;
OutputType.tp_free = call_PyObject_Free;
+ OutputType.tp_base = &PyStdPrinter_Type;
#else
OutputType.tp_getattr = (getattrfunc)OutputGetattr;
OutputType.tp_setattr = (setattrfunc)OutputSetattr;
+ // Disabled, because this causes a crash in test86
+ // OutputType.tp_base = &PyFile_Type;
#endif
vim_memset(&IterType, 0, sizeof(IterType));
*** ../vim-8.0.1845/src/if_python.c 2018-03-29 18:15:21.850258760 +0200
--- src/if_python.c 2018-03-29 18:08:42.134073927 +0200
***************
*** 247,252 ****
--- 247,253 ----
# define PySys_GetObject dll_PySys_GetObject
# define PySys_SetArgv dll_PySys_SetArgv
# define PyType_Type (*dll_PyType_Type)
+ # define PyFile_Type (*dll_PyFile_Type)
# define PySlice_Type (*dll_PySlice_Type)
# define PyType_Ready (*dll_PyType_Ready)
# define PyType_GenericAlloc dll_PyType_GenericAlloc
***************
*** 395,400 ****
--- 396,402 ----
static PyObject *(*dll_PySys_GetObject)(char *);
static int(*dll_PySys_SetArgv)(int, char **);
static PyTypeObject* dll_PyType_Type;
+ static PyTypeObject* dll_PyFile_Type;
static PyTypeObject* dll_PySlice_Type;
static int (*dll_PyType_Ready)(PyTypeObject *type);
static PyObject* (*dll_PyType_GenericAlloc)(PyTypeObject *type, PyInt nitems);
***************
*** 580,585 ****
--- 582,588 ----
{"PySys_GetObject", (PYTHON_PROC*)&dll_PySys_GetObject},
{"PySys_SetArgv", (PYTHON_PROC*)&dll_PySys_SetArgv},
{"PyType_Type", (PYTHON_PROC*)&dll_PyType_Type},
+ {"PyFile_Type", (PYTHON_PROC*)&dll_PyFile_Type},
{"PySlice_Type", (PYTHON_PROC*)&dll_PySlice_Type},
{"PyType_Ready", (PYTHON_PROC*)&dll_PyType_Ready},
{"PyType_GenericAlloc", (PYTHON_PROC*)&dll_PyType_GenericAlloc},
*** ../vim-8.0.1845/src/if_python3.c 2018-04-14 14:37:02.768137636 +0200
--- src/if_python3.c 2018-04-14 13:54:46.197359769 +0200
***************
*** 231,236 ****
--- 231,237 ----
# define PyFloat_AsDouble py3_PyFloat_AsDouble
# define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr
# define PyType_Type (*py3_PyType_Type)
+ # define PyStdPrinter_Type (*py3_PyStdPrinter_Type)
# define PySlice_Type (*py3_PySlice_Type)
# define PyFloat_Type (*py3_PyFloat_Type)
# define PyNumber_Check (*py3_PyNumber_Check)
***************
*** 388,393 ****
--- 389,395 ----
static PyObject* (*py3_PyType_GenericAlloc)(PyTypeObject *type, Py_ssize_t
nitems);
static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args,
PyObject *kwds);
static PyTypeObject* py3_PyType_Type;
+ static PyTypeObject* py3_PyStdPrinter_Type;
static PyTypeObject* py3_PySlice_Type;
static PyTypeObject* py3_PyFloat_Type;
static PyTypeObject* py3_PyBool_Type;
***************
*** 548,553 ****
--- 550,556 ----
{"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc},
{"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew},
{"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type},
+ {"PyStdPrinter_Type", (PYTHON_PROC*)&py3_PyStdPrinter_Type},
{"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type},
{"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type},
{"PyBool_Type", (PYTHON_PROC*)&py3_PyBool_Type},
*** ../vim-8.0.1845/src/version.c 2018-05-15 22:25:35.670456705 +0200
--- src/version.c 2018-05-15 22:26:43.278062505 +0200
***************
*** 763,764 ****
--- 763,766 ----
{ /* Add new patch number below this line */
+ /**/
+ 1846,
/**/
--
Beer & pretzels can't be served at the same time in any bar or restaurant.
[real standing law in North Dakota, United States of America]
/// 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].
For more options, visit https://groups.google.com/d/optout.
