sthagen
diff --git a/‎Misc/NEWS‎
Lines changed: 4 additions & 0 deletions b/‎Misc/NEWS‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎Python/ceval.c‎
Lines changed: 6 additions & 0 deletions b/‎Python/ceval.c‎
Lines changed: 6 additions & 0 deletions
@@ -36,6 +36,10 @@ Core and builtins
 
 - Bug #845802: Python crashed when __init__.py is a directory.
 
+- Bug #875692: Improve signal handling, especially when using threads, by
+  forcing an early re-execution of PyEval_EvalFrame() "periodic" code when
+  things_to_do is not cleared by Py_MakePendingCalls().
+
 Extension modules
 -----------------
 
 
@@ -785,6 +785,12 @@ eval_frame(PyFrameObject *f)
 					why = WHY_EXCEPTION;
 					goto on_error;
 				}
+				if (things_to_do)
+					/* MakePendingCalls() didn't succeed.
+					   Force early re-execution of this
+					   "periodic" code, possibly after
+					   a thread switch */
+					_Py_Ticker = 0;
 			}
 #if !defined(HAVE_SIGNAL_H) || defined(macintosh)
 			/* If we have true signals, the signal handler
Original file line number	Diff line number	Diff line change
`@@ -785,6 +785,12 @@ eval_frame(PyFrameObject *f)`
`785`	`785`	`why = WHY_EXCEPTION;`
`786`	`786`	`goto on_error;`
`787`	`787`	`}`
	`788`	`+ if (things_to_do)`
	`789`	`+ /* MakePendingCalls() didn't succeed.`
	`790`	`+ Force early re-execution of this`
	`791`	`+ "periodic" code, possibly after`
	`792`	`+ a thread switch */`
	`793`	`+ _Py_Ticker = 0;`
`788`	`794`	`}`
`789`	`795`	`#if !defined(HAVE_SIGNAL_H) \|\| defined(macintosh)`
`790`	`796`	`/* If we have true signals, the signal handler`