]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
updated for version 7.3.716 v7.3.716
authorBram Moolenaar <Bram@vim.org>
Tue, 20 Nov 2012 10:04:35 +0000 (11:04 +0100)
committerBram Moolenaar <Bram@vim.org>
Tue, 20 Nov 2012 10:04:35 +0000 (11:04 +0100)
Problem:    Error on exit when using Python 3.
Solution:   Remove PythonIO_Fini(). (Roland Puntaier)

src/if_python3.c
src/version.c

index 3bca5695906802fc3488413d7985d05cccd29eb0..f8dafd2f071875e15252baefcb960c58d99aacfa 100644 (file)
@@ -657,7 +657,6 @@ static Py_ssize_t RangeEnd;
 static PyObject *globals;
 
 static int PythonIO_Init(void);
-static void PythonIO_Fini(void);
 PyMODINIT_FUNC Py3Init_vim(void);
 
 /******************************************************
@@ -685,7 +684,6 @@ python3_end()
        // acquire lock before finalizing
        pygilstate = PyGILState_Ensure();
 
-       PythonIO_Fini();
        Py_Finalize();
     }
 
@@ -989,13 +987,6 @@ PythonIO_Init(void)
     return PythonIO_Init_io();
 }
 
-    static void
-PythonIO_Fini(void)
-{
-    PySys_SetObject("stdout", NULL);
-    PySys_SetObject("stderr", NULL);
-}
-
 /******************************************************
  * 3. Implementation of the Vim module for Python
  */
index 6fbe44a903fef4f2930bbf5b6852e037dfc638f6..607c55abc3603be83f1be89bc639dad41e124ef2 100644 (file)
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    716,
 /**/
     715,
 /**/