Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .github/workflows/tail-call.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
# Un-comment as we add support for more platforms for tail-calling interpreters.
# - i686-pc-windows-msvc/msvc
- x86_64-pc-windows-msvc/msvc
- free-threading-msvc
# - aarch64-pc-windows-msvc/msvc
- x86_64-apple-darwin/clang
- aarch64-apple-darwin/clang
Expand All @@ -53,6 +54,9 @@ jobs:
- target: x86_64-pc-windows-msvc/msvc
architecture: x64
runner: windows-2025-vs2026
- target: free-threading-msvc
architecture: x64
runner: windows-2025-vs2026
# - target: aarch64-pc-windows-msvc/msvc
# architecture: ARM64
# runner: windows-2022
Expand Down Expand Up @@ -80,13 +84,21 @@ jobs:
python-version: '3.11'

- name: Native Windows MSVC (release)
if: runner.os == 'Windows' && matrix.architecture != 'ARM64'
if: runner.os == 'Windows' && matrix.architecture != 'ARM64' && matrix.target != 'free-threading-msvc'
shell: pwsh
run: |
$env:PlatformToolset = "v145"
./PCbuild/build.bat --tail-call-interp -c Release -p ${{ matrix.architecture }}
./PCbuild/rt.bat -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3

# No tests:
- name: Native Windows MSVC with free-threading (release)
if: matrix.target == 'free-threading-msvc'
shell: pwsh
run: |
$env:PlatformToolset = "v145"
./PCbuild/build.bat --tail-call-interp --disable-gil -c Release -p ${{ matrix.architecture }}

# No tests (yet):
- name: Emulated Windows Clang (release)
if: runner.os == 'Windows' && matrix.architecture == 'ARM64'
Expand Down
73 changes: 42 additions & 31 deletions Doc/library/argparse.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1771,7 +1771,7 @@ Subcommands
>>> parser.parse_args(['--foo', 'b', '--baz', 'Z'])
Namespace(baz='Z', foo=True)

Note that the object returned by :meth:`parse_args` will only contain
Note that the object returned by :meth:`~ArgumentParser.parse_args` will only contain
attributes for the main parser and the subparser that was selected by the
command line (and not any other subparsers). So in the example above, when
the ``a`` command is specified, only the ``foo`` and ``bar`` attributes are
Expand Down Expand Up @@ -1814,7 +1814,7 @@ Subcommands
-h, --help show this help message and exit
--baz {X,Y,Z} baz help

The :meth:`add_subparsers` method also supports ``title`` and ``description``
The :meth:`~ArgumentParser.add_subparsers` method also supports ``title`` and ``description``
keyword arguments. When either is present, the subparser's commands will
appear in their own group in the help output. For example::

Expand All @@ -1835,34 +1835,8 @@ Subcommands

{foo,bar} additional help

Furthermore, :meth:`~_SubParsersAction.add_parser` supports an additional
*aliases* argument,
which allows multiple strings to refer to the same subparser. This example,
like ``svn``, aliases ``co`` as a shorthand for ``checkout``::

>>> parser = argparse.ArgumentParser()
>>> subparsers = parser.add_subparsers()
>>> checkout = subparsers.add_parser('checkout', aliases=['co'])
>>> checkout.add_argument('foo')
>>> parser.parse_args(['co', 'bar'])
Namespace(foo='bar')

:meth:`~_SubParsersAction.add_parser` supports also an additional
*deprecated* argument, which allows to deprecate the subparser.

>>> import argparse
>>> parser = argparse.ArgumentParser(prog='chicken.py')
>>> subparsers = parser.add_subparsers()
>>> run = subparsers.add_parser('run')
>>> fly = subparsers.add_parser('fly', deprecated=True)
>>> parser.parse_args(['fly']) # doctest: +SKIP
chicken.py: warning: command 'fly' is deprecated
Namespace()

.. versionadded:: 3.13

One particularly effective way of handling subcommands is to combine the use
of the :meth:`add_subparsers` method with calls to :meth:`set_defaults` so
of the :meth:`~ArgumentParser.add_subparsers` method with calls to :meth:`~ArgumentParser.set_defaults` so
that each subparser knows which Python function it should execute. For
example::

Expand Down Expand Up @@ -1898,12 +1872,12 @@ Subcommands
>>> args.func(args)
((XYZYX))

This way, you can let :meth:`parse_args` do the job of calling the
This way, you can let :meth:`~ArgumentParser.parse_args` do the job of calling the
appropriate function after argument parsing is complete. Associating
functions with actions like this is typically the easiest way to handle the
different actions for each of your subparsers. However, if it is necessary
to check the name of the subparser that was invoked, the ``dest`` keyword
argument to the :meth:`add_subparsers` call will work::
argument to the :meth:`~ArgumentParser.add_subparsers` call will work::

>>> parser = argparse.ArgumentParser()
>>> subparsers = parser.add_subparsers(dest='subparser_name')
Expand All @@ -1922,6 +1896,43 @@ Subcommands
the main parser.


.. method:: _SubParsersAction.add_parser(name, *, help=None, aliases=None,
deprecated=False, **kwargs)

Create and return a new :class:`ArgumentParser` object for the
subcommand *name*.

The *name* argument is the name of the sub-command.

The *help* argument provides a short description for this sub-command.

The *aliases* argument allows providing alternative names for this
sub-command. For example::

>>> parser = argparse.ArgumentParser()
>>> subparsers = parser.add_subparsers()
>>> checkout = subparsers.add_parser('checkout', aliases=['co'])
>>> checkout.add_argument('foo')
>>> parser.parse_args(['co', 'bar'])
Namespace(foo='bar')

The *deprecated* argument, if ``True``, marks the sub-command as
deprecated and will issue a warning when used. For example::

>>> parser = argparse.ArgumentParser(prog='chicken.py')
>>> subparsers = parser.add_subparsers()
>>> fly = subparsers.add_parser('fly', deprecated=True)
>>> args = parser.parse_args(['fly'])
chicken.py: warning: command 'fly' is deprecated
Namespace()

All other keyword arguments are passed directly to the
:class:`!ArgumentParser` constructor.

.. versionadded:: 3.13
Added the *deprecated* parameter.


FileType objects
^^^^^^^^^^^^^^^^

Expand Down
5 changes: 5 additions & 0 deletions Include/internal/pycore_ceval.h
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,11 @@ _Py_assert_within_stack_bounds(
_PyInterpreterFrame *frame, _PyStackRef *stack_pointer,
const char *filename, int lineno);

PyAPI_FUNC(_PyStackRef)
_Py_LoadAttr_StackRefSteal(
PyThreadState *tstate, _PyStackRef owner,
PyObject *name, _PyStackRef *self_or_null);

// Like PyMapping_GetOptionalItem, but returns the PyObject* instead of taking
// it as an out parameter. This helps MSVC's escape analysis when used with
// tail calling.
Expand Down
13 changes: 2 additions & 11 deletions Lib/importlib/metadata/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -890,14 +890,6 @@ def search(self, prepared: Prepared):
return itertools.chain(infos, eggs)


# Translation table for Prepared.normalize: lowercase and
# replace "-" (hyphen) and "." (dot) with "_" (underscore).
_normalize_table = str.maketrans(
"ABCDEFGHIJKLMNOPQRSTUVWXYZ-.",
"abcdefghijklmnopqrstuvwxyz__",
)


class Prepared:
"""
A prepared search query for metadata on a possibly-named package.
Expand Down Expand Up @@ -933,9 +925,8 @@ def normalize(name):
"""
PEP 503 normalization plus dashes as underscores.
"""
# Emulates ``re.sub(r"[-_.]+", "-", name).lower()`` from PEP 503
# About 3x faster, safe since packages only support alphanumeric characters
value = name.translate(_normalize_table)
# Much faster than re.sub, and even faster than str.translate
value = name.lower().replace("-", "_").replace(".", "_")
# Condense repeats (faster than regex)
while "__" in value:
value = value.replace("__", "_")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix building the tail calling interpreter on Visual Studio 2026 with free-threading.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
:mod:`importlib.metadata`: Use :meth:`str.lower` and :meth:`str.replace` to
further improve performance of
:meth:`!importlib.metadata.Prepared.normalize`. Patch by Hugo van Kemenade
and Henry Schreiner.
23 changes: 3 additions & 20 deletions Modules/_testinternalcapi/test_cases.c.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 3 additions & 25 deletions Python/bytecodes.c
Original file line number Diff line number Diff line change
Expand Up @@ -2364,31 +2364,9 @@ dummy_func(
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 1);
if (oparg & 1) {
/* Designed to work in tandem with CALL, pushes two values. */
_PyCStackRef method;
_PyThreadState_PushCStackRef(tstate, &method);
int is_meth = _PyObject_GetMethodStackRef(tstate, PyStackRef_AsPyObjectBorrow(owner), name, &method.ref);
if (is_meth) {
/* We can bypass temporary bound method object.
meth is unbound method and obj is self.
meth | self | arg1 | ... | argN
*/
assert(!PyStackRef_IsNull(method.ref)); // No errors on this branch
self_or_null[0] = owner; // Transfer ownership
DEAD(owner);
attr = _PyThreadState_PopCStackRefSteal(tstate, &method);
}
else {
/* meth is not an unbound method (but a regular attr, or
something was returned by a descriptor protocol). Set
the second element of the stack to NULL, to signal
CALL that it's not a method call.
meth | NULL | arg1 | ... | argN
*/
PyStackRef_CLOSE(owner);
self_or_null[0] = PyStackRef_NULL;
attr = _PyThreadState_PopCStackRefSteal(tstate, &method);
ERROR_IF(PyStackRef_IsNull(attr));
}
attr = _Py_LoadAttr_StackRefSteal(tstate, owner, name, self_or_null);
DEAD(owner);
ERROR_IF(PyStackRef_IsNull(attr));
}
else {
/* Classic, pushes one value. */
Expand Down
28 changes: 28 additions & 0 deletions Python/ceval.c
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,34 @@ _Py_BuildMap_StackRefSteal(
return res;
}

_PyStackRef
_Py_LoadAttr_StackRefSteal(
PyThreadState *tstate, _PyStackRef owner,
PyObject *name, _PyStackRef *self_or_null)
{
_PyCStackRef method;
_PyThreadState_PushCStackRef(tstate, &method);
int is_meth = _PyObject_GetMethodStackRef(tstate, PyStackRef_AsPyObjectBorrow(owner), name, &method.ref);
if (is_meth) {
/* We can bypass temporary bound method object.
meth is unbound method and obj is self.
meth | self | arg1 | ... | argN
*/
assert(!PyStackRef_IsNull(method.ref)); // No errors on this branch
self_or_null[0] = owner; // Transfer ownership
return _PyThreadState_PopCStackRefSteal(tstate, &method);
}
/* meth is not an unbound method (but a regular attr, or
something was returned by a descriptor protocol). Set
the second element of the stack to NULL, to signal
CALL that it's not a method call.
meth | NULL | arg1 | ... | argN
*/
PyStackRef_CLOSE(owner);
self_or_null[0] = PyStackRef_NULL;
return _PyThreadState_PopCStackRefSteal(tstate, &method);
}

#ifdef Py_DEBUG
void
_Py_assert_within_stack_bounds(
Expand Down
26 changes: 6 additions & 20 deletions Python/executor_cases.c.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 3 additions & 20 deletions Python/generated_cases.c.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading