summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-08-17 22:26:51 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-08-17 22:26:51 (GMT)
commit6961bd690e617b963a55ce86a640eedb590bc23b (patch)
treec997f4ea6d0c890bb1551fb43a14c0b25441e17a
parent6009ece0ede4a2a39b3cfe15d53fed9e33422276 (diff)
downloadcpython-6961bd690e617b963a55ce86a640eedb590bc23b.zip
cpython-6961bd690e617b963a55ce86a640eedb590bc23b.tar.gz
cpython-6961bd690e617b963a55ce86a640eedb590bc23b.tar.bz2
Issue #8063: Call _PyGILState_Init() earlier in Py_InitializeEx().
-rw-r--r--Misc/NEWS2
-rw-r--r--Python/pythonrun.c10
2 files changed, 7 insertions, 5 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 4e11922..586aa7e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.2 Alpha 2?
Core and Builtins
-----------------
+- Issue #8063: Call _PyGILState_Init() earlier in Py_InitializeEx().
+
- Issue #9612: The set object is now 64-bit clean under Windows.
- Issue #8202: sys.argv[0] is now set to '-m' instead of '-c' when searching
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index a7a54ba..76a8eef 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -206,6 +206,11 @@ Py_InitializeEx(int install_sigs)
Py_FatalError("Py_Initialize: can't make first thread");
(void) PyThreadState_Swap(tstate);
+ /* auto-thread-state API, if available */
+#ifdef WITH_THREAD
+ _PyGILState_Init(interp, tstate);
+#endif /* WITH_THREAD */
+
_Py_ReadyTypes();
if (!_PyFrame_Init())
@@ -288,11 +293,6 @@ Py_InitializeEx(int install_sigs)
Py_FatalError(
"Py_Initialize: can't initialize sys standard streams");
- /* auto-thread-state API, if available */
-#ifdef WITH_THREAD
- _PyGILState_Init(interp, tstate);
-#endif /* WITH_THREAD */
-
if (!Py_NoSiteFlag)
initsite(); /* Module site */
}