Skip to content

Commit 24aabac

Browse files
Merge branch '3.13' into backport-6b81784-3.13
2 parents 477136f + e7f42be commit 24aabac

49 files changed

Lines changed: 1955 additions & 609 deletions

Some content is hidden

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

.github/workflows/jit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
compiler: msvc
8383
- target: x86_64-apple-darwin/clang
8484
architecture: x86_64
85-
runner: macos-15-intel
85+
runner: macos-26-intel
8686
compiler: clang
8787
- target: aarch64-apple-darwin/clang
8888
architecture: aarch64

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ repos:
9494
- id: check-readthedocs
9595

9696
- repo: https://github.com/rhysd/actionlint
97-
rev: 393031adb9afb225ee52ae2ccd7a5af5525e03e8 # frozen: v1.7.11
97+
rev: 914e7df21a07ef503a81201c76d2b11c789d3fca # frozen: v1.7.12
9898
hooks:
9999
- id: actionlint
100100

Doc/library/string.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,8 @@ attributes:
943943

944944
Alternatively, you can provide the entire regular expression pattern by
945945
overriding the class attribute *pattern*. If you do this, the value must be a
946-
regular expression object with four named capturing groups. The capturing
946+
regular expression pattern string, or a compiled regular expression
947+
object, with four named capturing groups. The capturing
947948
groups correspond to the rules given above, along with the invalid placeholder
948949
rule:
949950

Doc/library/tkinter.font.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ The different font weights and slants are:
5454
requested ones because of platform limitations.
5555
With no *option*, return a dictionary of all the attributes; if *option*
5656
is given, return the value of that single attribute.
57+
The attributes are resolved on the display of the *displayof* widget,
58+
or the main application window if it is not specified.
5759

5860
.. method:: cget(option)
5961

@@ -71,7 +73,11 @@ The different font weights and slants are:
7173

7274
.. method:: copy()
7375

74-
Return new instance of the current font.
76+
Return a distinct copy of the current font:
77+
a new named font with the same attributes but a different name,
78+
which can be reconfigured independently of the original.
79+
If the current font wraps a font description,
80+
the copy is instead a named font with its resolved attributes.
7581

7682
.. method:: measure(text, displayof=None)
7783

Doc/library/tkinter.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,7 +1981,7 @@ Base and mixin classes
19811981

19821982
.. method:: winfo_exists()
19831983

1984-
Return ``1`` if the widget exists, ``0`` otherwise.
1984+
Return true if the widget exists, false otherwise.
19851985

19861986
.. method:: winfo_fpixels(number)
19871987

@@ -2020,7 +2020,7 @@ Base and mixin classes
20202020

20212021
.. method:: winfo_ismapped()
20222022

2023-
Return ``1`` if the widget is currently mapped, ``0`` otherwise.
2023+
Return true if the widget is currently mapped, false otherwise.
20242024

20252025
.. method:: winfo_manager()
20262026

@@ -2151,8 +2151,8 @@ Base and mixin classes
21512151

21522152
.. method:: winfo_viewable()
21532153

2154-
Return ``1`` if the widget and all of its ancestors up through the
2155-
nearest toplevel window are mapped, ``0`` otherwise.
2154+
Return true if the widget and all of its ancestors up through the
2155+
nearest toplevel window are mapped, false otherwise.
21562156

21572157
.. method:: winfo_visual()
21582158

@@ -5526,7 +5526,7 @@ Widget classes
55265526
.. method:: edit_modified(arg=None)
55275527

55285528
If *arg* is omitted, return the current state of the modified flag as
5529-
``0`` or ``1``; the flag is set automatically whenever the text is
5529+
true or false; the flag is set automatically whenever the text is
55305530
inserted or deleted.
55315531
Otherwise set the flag to the boolean *arg*.
55325532

Doc/library/urllib.parse.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,8 +593,9 @@ task isn't already covered by the URL parsing functions above.
593593

594594
The optional *encoding* and *errors* parameters specify how to deal with
595595
non-ASCII characters, as accepted by the :meth:`str.encode` method.
596-
*encoding* defaults to ``'utf-8'``.
597-
*errors* defaults to ``'strict'``, meaning unsupported characters raise a
596+
Although these parameters default to ``None`` in the function signature,
597+
when processing :class:`str` inputs, *encoding* effectively defaults to ``'utf-8'``
598+
and *errors* to ``'strict'``, meaning unsupported characters raise a
598599
:class:`UnicodeEncodeError`.
599600
*encoding* and *errors* must not be supplied if *string* is a
600601
:class:`bytes`, or a :class:`TypeError` is raised.

Doc/tools/.nitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,4 @@ Doc/library/xml.sax.reader.rst
4040
Doc/library/xml.sax.rst
4141
Doc/library/xmlrpc.client.rst
4242
Doc/library/xmlrpc.server.rst
43-
Doc/whatsnew/2.4.rst
44-
Doc/whatsnew/2.5.rst
4543
Doc/whatsnew/2.6.rst

Doc/using/windows.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,9 @@ on using nuget. What follows is a summary that is sufficient for Python
454454
developers.
455455

456456
The ``nuget.exe`` command line tool may be downloaded directly from
457-
``https://aka.ms/nugetclidl``, for example, using curl or PowerShell. With the
458-
tool, the latest version of Python for 64-bit or 32-bit machines is installed
459-
using::
457+
``https://dist.nuget.org/win-x86-commandline/latest/nuget.exe``, for example,
458+
using curl or PowerShell. With the tool, the latest version of Python for
459+
64-bit or 32-bit machines is installed using::
460460

461461
nuget.exe install python -ExcludeVersion -OutputDirectory .
462462
nuget.exe install pythonx86 -ExcludeVersion -OutputDirectory .

0 commit comments

Comments
 (0)