[Python-checkins] r84163 - in python/branches/py3k: Misc/NEWS Python/pythonrun.c

[victor.stinner]

Author: victor.stinner
Date: Wed Aug 18 00:26:51 2010
New Revision: 84163

Log:
Issue #8063: Call _PyGILState_Init() earlier in Py_InitializeEx().


Modified:
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Python/pythonrun.c

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Wed Aug 18 00:26:51 2010
@@ -12,6 +12,8 @@
 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

Modified: python/branches/py3k/Python/pythonrun.c
==============================================================================
--- python/branches/py3k/Python/pythonrun.c	(original)
+++ python/branches/py3k/Python/pythonrun.c	Wed Aug 18 00:26:51 2010
@@ -206,6 +206,11 @@
         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_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 */
 }