Merge branch 'main' into resolve-differences-between-asynccontextmanager-and-contextmanager

graingert · web-flow · commit 2990340eb4bb · 2022-08-11T13:18:57.000+01:00
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -630,8 +630,8 @@ _PyEval_AddPendingCall(PyInterpreterState *interp,
 {
     struct _pending_calls *pending = &interp->ceval.pending;
 
-    /* Ensure that _PyEval_InitPendingCalls() was called
-       and that _PyEval_FiniPendingCalls() is not called yet. */
+    /* Ensure that _PyEval_InitState() was called
+       and that _PyEval_FiniState() is not called yet. */
     assert(pending->lock != NULL);
 
     PyThread_acquire_lock(pending->lock, WAIT_LOCK);

Original file line number	Diff line number	Diff line change
`@@ -630,8 +630,8 @@ _PyEval_AddPendingCall(PyInterpreterState *interp,`
`630`	`630`	`{`
`631`	`631`	`struct _pending_calls *pending = &interp->ceval.pending;`
`632`	`632`
`633`		`- /* Ensure that _PyEval_InitPendingCalls() was called`
`634`		`- and that _PyEval_FiniPendingCalls() is not called yet. */`
	`633`	`+ /* Ensure that _PyEval_InitState() was called`
	`634`	`+ and that _PyEval_FiniState() is not called yet. */`
`635`	`635`	`assert(pending->lock != NULL);`
`636`	`636`
`637`	`637`	`PyThread_acquire_lock(pending->lock, WAIT_LOCK);`