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

[benjamin.peterson]

http://hg.python.org/cpython/rev/556b37984622
changeset:   91232:556b37984622
parent:      91228:a82d7e028458
parent:      91231:d1d1ed421717
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jun 16 23:07:15 2014 -0700
summary:
  merge 3.4

files:
  Python/ceval.c |  7 +++++++
  1 files changed, 7 insertions(+), 0 deletions(-)


diff --git a/Python/ceval.c b/Python/ceval.c
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1267,6 +1267,13 @@
                 /* Other threads may run now */
 
                 take_gil(tstate);
+
+                /* Check if we should make a quick exit. */
+                if (_Py_Finalizing && _Py_Finalizing != tstate) {
+                    drop_gil(tstate);
+                    PyThread_exit_thread();
+                }
+
                 if (PyThreadState_Swap(tstate) != NULL)
                     Py_FatalError("ceval: orphan tstate");
             }

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