[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

http://hg.python.org/cpython/rev/abcf17bc5eae
changeset:   91244:abcf17bc5eae
parent:      91241:eed8538d5940
parent:      91243:3ce746735b99
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Jun 17 00:34:56 2014 -0700
summary:
  merge 3.4

files:
  Python/pystate.c |  9 +--------
  1 files changed, 1 insertions(+), 8 deletions(-)


diff --git a/Python/pystate.c b/Python/pystate.c
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -425,14 +425,7 @@
     _Py_atomic_store_relaxed(&_PyThreadState_Current, NULL);
     if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
         PyThread_delete_key_value(autoTLSkey);
-    /*
-      Only call tstate_delete_common to have the tstate if we're not finalizing
-      or we're the main thread. The main thread will do this for us. Not calling
-      tstate_delete_common means we won't lock the interpreter head lock,
-      avoiding a possible deadlock with the GIL.
-    */
-    if (!_Py_Finalizing || _Py_Finalizing == tstate)
-        tstate_delete_common(tstate);
+    tstate_delete_common(tstate);
     PyEval_ReleaseLock();
 }
 #endif /* WITH_THREAD */

-- 
Repository URL: http://hg.python.org/cpython