patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Problem: PyEval_InitThreads() is deprecated in Python 3.9.
Solution: Do not call PyEval_InitThreads in Python 3.9 and later. (Ken
Takata, closes #7113) Avoid warnings for functions.
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 86942b6..36dedaf 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -307,7 +307,7 @@
// Output buffer management
// Function to write a line, points to either msg() or emsg().
-typedef void (*writefn)(char_u *);
+typedef int (*writefn)(char *);
static PyTypeObject OutputType;
@@ -359,8 +359,8 @@
{
if (old_fn != NULL && io_ga.ga_len > 0)
{
- ((char_u *)io_ga.ga_data)[io_ga.ga_len] = NUL;
- old_fn((char_u *)io_ga.ga_data);
+ ((char *)io_ga.ga_data)[io_ga.ga_len] = NUL;
+ old_fn((char *)io_ga.ga_data);
}
io_ga.ga_len = 0;
}
@@ -390,7 +390,7 @@
mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len);
((char *)io_ga.ga_data)[io_ga.ga_len + len] = NUL;
- fn((char_u *)io_ga.ga_data);
+ fn((char *)io_ga.ga_data);
str = ptr + 1;
n -= len + 1;
io_ga.ga_len = 0;
diff --git a/src/if_python3.c b/src/if_python3.c
index e148e53..495aed3 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -1002,11 +1002,10 @@
reset_stdin();
Py_Initialize();
- // Initialise threads, and below save the state using
- // PyEval_SaveThread. Without the call to PyEval_SaveThread, thread
- // specific state (such as the system trace hook), will be lost
- // between invocations of Python code.
+#if PY_VERSION_HEX < 0x03090000
+ // Initialise threads. This is deprecated since Python 3.9.
PyEval_InitThreads();
+#endif
#ifdef DYNAMIC_PYTHON3
get_py3_exceptions();
#endif
@@ -1024,12 +1023,14 @@
// sys.path.
PyRun_SimpleString("import vim; import sys; sys.path = list(filter(lambda x: not x.endswith('must>not&exist'), sys.path))");
- // lock is created and acquired in PyEval_InitThreads() and thread
- // state is created in Py_Initialize()
- // there _PyGILState_NoteThreadState() also sets gilcounter to 1
- // (python must have threads enabled!)
- // so the following does both: unlock GIL and save thread state in TLS
- // without deleting thread state
+ // Without the call to PyEval_SaveThread, thread specific state (such
+ // as the system trace hook), will be lost between invocations of
+ // Python code.
+ // GIL may have been created and acquired in PyEval_InitThreads() and
+ // thread state is created in Py_Initialize(); there
+ // _PyGILState_NoteThreadState() also sets gilcounter to 1 (python must
+ // have threads enabled!), so the following does both: unlock GIL and
+ // save thread state in TLS without deleting thread state
PyEval_SaveThread();
py3initialised = 1;
diff --git a/src/version.c b/src/version.c
index 4361345..ced1ef7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1834,
+/**/
1833,
/**/
1832,