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

[benjamin.peterson]

http://hg.python.org/cpython/rev/eed8538d5940
changeset:   91241:eed8538d5940
parent:      91239:6fc543e32a5b
parent:      91240:488daf4691f6
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jun 16 23:49:09 2014 -0700
summary:
  merge 3.4

files:
  Python/pystate.c |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Python/pystate.c b/Python/pystate.c
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -423,6 +423,8 @@
         Py_FatalError(
             "PyThreadState_DeleteCurrent: no current tstate");
     _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
@@ -431,9 +433,6 @@
     */
     if (!_Py_Finalizing || _Py_Finalizing == tstate)
         tstate_delete_common(tstate);
-    if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
-        PyThread_delete_key_value(autoTLSkey);
-    tstate_delete_common(tstate);
     PyEval_ReleaseLock();
 }
 #endif /* WITH_THREAD */

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