summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-05-23 19:58:21 (GMT)
committerNed Deily <nad@python.org>2018-05-23 19:58:21 (GMT)
commit508d7693bc09affd99fdaa4a321cc3da0638c8a0 (patch)
treeca52b3b05264ebbc58afdf0a8f150f17d0ca129b
parent2fc443c469fb15033b6b96acd727e2e7cc147adc (diff)
downloadcpython-508d7693bc09affd99fdaa4a321cc3da0638c8a0.zip
cpython-508d7693bc09affd99fdaa4a321cc3da0638c8a0.tar.gz
cpython-508d7693bc09affd99fdaa4a321cc3da0638c8a0.tar.bz2
bpo-33612: Remove PyThreadState_Clear() assertion (GH-7069) (GH-7074)
bpo-25612, bpo-33612: Remove an assertion from PyThreadState_Clear() which failed at Python shutdown or on fork if a thread was running a generator. (cherry picked from commit b6dccf54fd3bac9c87348d96f9d6b571608c15bc) Co-authored-by: Victor Stinner <vstinner@redhat.com>
-rw-r--r--Python/pystate.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/Python/pystate.c b/Python/pystate.c
index 7750f4c..15761e7 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -581,7 +581,6 @@ PyThreadState_Clear(PyThreadState *tstate)
Py_CLEAR(tstate->exc_state.exc_traceback);
/* The stack of exception states should contain just this thread. */
- assert(tstate->exc_info->previous_item == NULL);
if (Py_VerboseFlag && tstate->exc_info != &tstate->exc_state) {
fprintf(stderr,
"PyThreadState_Clear: warning: thread still has a generator\n");