updated for version 7.3.698

Problem:    Python 3 does not preserve state beween commands.
Solution:   Preserve the state. (Paul Ollis)

diff --git a/src/if_python.c b/src/if_python.c
index 2a53c93b0ca184cae866bd7744f91d5ffb243bdb..5e792b16d1397d57bb609a1dc9c5f10c9db59d5d 100644 (file)
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -740,9 +740,10 @@ Python_Init(void)
 #else
        PyMac_Initialize();
 #endif
-       /* Initialise threads and save the state using PyGILState_Ensure.
-        * Without this call, thread-specific state (such as the system trace
-        * hook), will be lost between invocations of Python code.  */
+       /* Initialise threads, and save the state using PyGILState_Ensure.
+        * Without the call to PyGILState_Ensure, thread specific state (such
+        * as the system trace hook), will be lost between invocations of
+        * Python code. */
        PyEval_InitThreads();
        pygilstate = PyGILState_Ensure();
 #ifdef DYNAMIC_PYTHON

diff --git a/src/if_python3.c b/src/if_python3.c
index ea59a4233ba681465adb62e3b351d1ab1d426002..e9f7400f80bc73ab2c38463dd0b4552004048cda 100644 (file)
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -731,8 +731,12 @@ Python3_Init(void)
 #else
        PyMac_Initialize();
 #endif
-       /* initialise threads, must be after Py_Initialize() */
+       /* Initialise threads, and save the state using PyGILState_Ensure.
+        * Without the call to PyGILState_Ensure, thread specific state (such
+        * as the system trace hook), will be lost between invocations of
+        * Python code. */
        PyEval_InitThreads();
+       pygilstate = PyGILState_Ensure();
 
 #ifdef DYNAMIC_PYTHON3
        get_py3_exceptions();

diff --git a/src/version.c b/src/version.c
index d10266df88a8619dbb4180cdaa68952b48cb1805..6613e50daaf500a398f17559d1620c8cff2d6e57 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    698,
 /**/
     697,
 /**/