]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.144 v7.3.144
authorBram Moolenaar <Bram@vim.org>
Sat, 26 Mar 2011 12:56:48 +0000 (13:56 +0100)
committerBram Moolenaar <Bram@vim.org>
Sat, 26 Mar 2011 12:56:48 +0000 (13:56 +0100)
Problem:    Crash with ":python help(dir)". (Kearn Holliday)
Solution:   Fix the way the type is set on objects. (Tobias Columbus)

src/if_python.c
src/version.c

index 26e5f1d883f0676d6b10df4a9824d8497f841250..fc493ecaa3109c2435e46d587cae40f61522c50d 100644 (file)
@@ -780,7 +780,7 @@ OutputSetattr(PyObject *self, char *name, PyObject *val)
 PythonIO_Init(void)
 {
     /* Fixups... */
-    OutputType.ob_type = &PyType_Type;
+    PyType_Ready(&OutputType);
 
     return PythonIO_Init_io();
 }
@@ -1402,12 +1402,12 @@ PythonMod_Init(void)
     static char *(argv[2]) = {"/must>not&exist/foo", NULL};
 
     /* Fixups... */
-    BufferType.ob_type = &PyType_Type;
-    RangeType.ob_type = &PyType_Type;
-    WindowType.ob_type = &PyType_Type;
-    BufListType.ob_type = &PyType_Type;
-    WinListType.ob_type = &PyType_Type;
-    CurrentType.ob_type = &PyType_Type;
+    PyType_Ready(&BufferType);
+    PyType_Ready(&RangeType);
+    PyType_Ready(&WindowType);
+    PyType_Ready(&BufListType);
+    PyType_Ready(&WinListType);
+    PyType_Ready(&CurrentType);
 
     /* Set sys.argv[] to avoid a crash in warn(). */
     PySys_SetArgv(1, argv);
index bec8769dc1359ba03aa61f8a91a1dc0c6ada6133..212df7aa6ccdc87636b6bcbfec0bf334f783a8ea 100644 (file)
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    144,
 /**/
     143,
 /**/