diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-06-17 06:49:09 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-06-17 06:49:09 (GMT) |
| commit | 89cef795eba63eef63eb2a7349ef7631f4071ab9 (patch) | |
| tree | 9bfb7cbcc769f95c2b4f45731130e45bc9a5725e /Python | |
| parent | 2ce54c2912ba4c1cb7278f319d455a01db70db4f (diff) | |
| parent | 95d75194ac2a96bef077d8ac6c5879c14ca8bb08 (diff) | |
| download | cpython-89cef795eba63eef63eb2a7349ef7631f4071ab9.zip cpython-89cef795eba63eef63eb2a7349ef7631f4071ab9.tar.gz cpython-89cef795eba63eef63eb2a7349ef7631f4071ab9.tar.bz2 | |
merge 3.4
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pystate.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Python/pystate.c b/Python/pystate.c index 8c1fad2..7afca17 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -423,6 +423,8 @@ PyThreadState_DeleteCurrent() 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 @@ PyThreadState_DeleteCurrent() */ 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 */ |