Skip to content

Commit ae1e146

Browse files
committed
Merge remote-tracking branch 'upstream/main' into expose_codegen
2 parents 9bafd3a + 2eee9d9 commit ae1e146

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+8260
-9379
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Doc/library/token-list.inc generated
6969
Include/internal/pycore_ast.h generated
7070
Include/internal/pycore_ast_state.h generated
7171
Include/internal/pycore_opcode.h generated
72-
Include/internal/pycore_runtime_init_generated.h generated
72+
Include/internal/pycore_*_generated.h generated
7373
Include/opcode.h generated
7474
Include/token.h generated
7575
Lib/keyword.py generated

.github/CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@ Lib/ast.py @isidentical
137137

138138
**/*typing* @gvanrossum @Fidget-Spinner @JelleZijlstra @AlexWaygood
139139

140-
**/*asyncore @giampaolo
141-
**/*asynchat @giampaolo
142140
**/*ftplib @giampaolo
143141
**/*shutil @giampaolo
144142

Doc/c-api/frame.rst

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,25 @@ See also :ref:`Reflection <reflection>`.
7979
.. versionadded:: 3.11
8080
8181
82+
.. c:function:: PyObject* PyFrame_GetVar(PyFrameObject *frame, PyObject *name)
83+
84+
Get the variable *name* of *frame*.
85+
86+
* Return a :term:`strong reference` to the variable value on success.
87+
* Raise :exc:`NameError` and return ``NULL`` if the variable does not exist.
88+
* Raise an exception and return ``NULL`` on error.
89+
90+
.. versionadded:: 3.12
91+
92+
93+
.. c:function:: PyObject* PyFrame_GetVarString(PyFrameObject *frame, const char *name)
94+
95+
Similar to :c:func:`PyFrame_GetVar`, but the variable name is a C string
96+
encoded in UTF-8.
97+
98+
.. versionadded:: 3.12
99+
100+
82101
.. c:function:: PyObject* PyFrame_GetLocals(PyFrameObject *frame)
83102
84103
Get the *frame*'s ``f_locals`` attribute (:class:`dict`).

Doc/library/asynchat.rst

Lines changed: 0 additions & 217 deletions
This file was deleted.

Doc/library/asyncio-subprocess.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ their completion.
175175

176176
* the :meth:`~asyncio.subprocess.Process.communicate` and
177177
:meth:`~asyncio.subprocess.Process.wait` methods don't have a
178-
*timeout* parameter: use the :func:`wait_for` function;
178+
*timeout* parameter: use the :func:`~asyncio.wait_for` function;
179179

180180
* the :meth:`Process.wait() <asyncio.subprocess.Process.wait>` method
181181
is asynchronous, whereas :meth:`subprocess.Popen.wait` method

0 commit comments

Comments
 (0)