summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-11-20 11:04:35 +0100
committerBram Moolenaar <Bram@vim.org>2012-11-20 11:04:35 +0100
commit99a547d3a1d1315a1a20246eb53fc63a306702d6 (patch)
treee351de9ea0f5e675968c6af54e64179a3ef715b0
parent97d62497f51902f404c7dcc72683411df911593e (diff)
updated for version 7.3.716v7.3.716
Problem: Error on exit when using Python 3. Solution: Remove PythonIO_Fini(). (Roland Puntaier)
-rw-r--r--src/if_python3.c9
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 9 deletions
diff --git a/src/if_python3.c b/src/if_python3.c
index 3bca569590..f8dafd2f07 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -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
*/
diff --git a/src/version.c b/src/version.c
index 6fbe44a903..607c55abc3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 716,
+/**/
715,
/**/
714,