Skip to content

Commit 7dac2a6

Browse files
committed
Merge remote-tracking branch 'upstream/main' into gh-145742-work
2 parents c59b71f + 611d606 commit 7dac2a6

File tree

13 files changed

+1404
-1272
lines changed

13 files changed

+1404
-1272
lines changed

Doc/library/asyncio-eventloop.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2055,7 +2055,7 @@ Wait until a file descriptor received some data using the
20552055
Set signal handlers for SIGINT and SIGTERM
20562056
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
20572057

2058-
(This ``signals`` example only works on Unix.)
2058+
(This ``signal`` example only works on Unix.)
20592059

20602060
Register handlers for signals :const:`~signal.SIGINT` and :const:`~signal.SIGTERM`
20612061
using the :meth:`loop.add_signal_handler` method::

Include/internal/pycore_opcode_metadata.h

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Include/internal/pycore_optimizer_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ typedef struct _Py_UOpsAbstractFrame {
147147
int stack_len;
148148
int locals_len;
149149
bool caller; // We have made a call from this frame during the trace
150+
bool is_c_recursion_checked;
150151
JitOptRef callable;
151152
PyFunctionObject *func;
152153
PyCodeObject *code;

0 commit comments

Comments
 (0)