Skip to content

Commit 6c85054

Browse files
committed
Merge branch 'main' into traceback-timestamps
2 parents 53b5500 + 2abb6a4 commit 6c85054

26 files changed

+907
-838
lines changed

.github/workflows/tail-call.yml

+2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
- 'Python/bytecodes.c'
66
- 'Python/ceval.c'
77
- 'Python/ceval_macros.h'
8+
- 'Python/generated_cases.c.h'
89
push:
910
paths:
1011
- 'Python/bytecodes.c'
1112
- 'Python/ceval.c'
1213
- 'Python/ceval_macros.h'
14+
- 'Python/generated_cases.c.h'
1315
workflow_dispatch:
1416

1517
permissions:

Doc/library/enum.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ Data Types
668668
* the result is a valid *IntFlag*: an *IntFlag* is returned
669669
* the result is not a valid *IntFlag*: the result depends on the :class:`FlagBoundary` setting
670670

671-
The :func:`repr` of unnamed zero-valued flags has changed. It is now:
671+
The :func:`repr` of unnamed zero-valued flags has changed. It is now::
672672

673673
>>> Color(0)
674674
<Color: 0>

Doc/library/idle.rst

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ IDLE --- Python editor and shell
1212
single: Python Editor
1313
single: Integrated Development Environment
1414

15+
..
16+
Remember to update Lib/idlelib/help.html with idlelib.help.copy_source() when modifying this file.
17+
1518
--------------
1619

1720
IDLE is Python's Integrated Development and Learning Environment.

Doc/whatsnew/3.14.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ Deprecated
933933
(Contributed by Victor Stinner in :gh:`120743`.)
934934

935935
* :mod:`pdb`:
936-
The undocumented ``pdb.Pdb.curframe_locals`` attribtue is now a deprecated
936+
The undocumented ``pdb.Pdb.curframe_locals`` attribute is now a deprecated
937937
read-only property. The low overhead dynamic frame locals access added in
938938
Python 3.13 by PEP 667 means the frame locals cache reference previously
939939
stored in this attribute is no longer needed. Derived debuggers should access

Lib/asyncio/tasks.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -245,23 +245,23 @@ def uncancel(self):
245245
return self._num_cancels_requested
246246

247247
def __eager_start(self):
248-
prev_task = _swap_current_task(self._loop, self)
248+
prev_task = _py_swap_current_task(self._loop, self)
249249
try:
250-
_register_eager_task(self)
250+
_py_register_eager_task(self)
251251
try:
252252
self._context.run(self.__step_run_and_handle_result, None)
253253
finally:
254-
_unregister_eager_task(self)
254+
_py_unregister_eager_task(self)
255255
finally:
256256
try:
257-
curtask = _swap_current_task(self._loop, prev_task)
257+
curtask = _py_swap_current_task(self._loop, prev_task)
258258
assert curtask is self
259259
finally:
260260
if self.done():
261261
self._coro = None
262262
self = None # Needed to break cycles when an exception occurs.
263263
else:
264-
_register_task(self)
264+
_py_register_task(self)
265265

266266
def __step(self, exc=None):
267267
if self.done():
@@ -273,11 +273,11 @@ def __step(self, exc=None):
273273
self._must_cancel = False
274274
self._fut_waiter = None
275275

276-
_enter_task(self._loop, self)
276+
_py_enter_task(self._loop, self)
277277
try:
278278
self.__step_run_and_handle_result(exc)
279279
finally:
280-
_leave_task(self._loop, self)
280+
_py_leave_task(self._loop, self)
281281
self = None # Needed to break cycles when an exception occurs.
282282

283283
def __step_run_and_handle_result(self, exc):

Lib/graphlib.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def done(self, *nodes):
154154
This method unblocks any successor of each node in *nodes* for being returned
155155
in the future by a call to "get_ready".
156156
157-
Raises :exec:`ValueError` if any node in *nodes* has already been marked as
157+
Raises ValueError if any node in *nodes* has already been marked as
158158
processed by a previous call to this method, if a node was not added to the
159159
graph by using "add" or if called without calling "prepare" previously or if
160160
node has not yet been returned by "get_ready".

Lib/idlelib/News3.txt

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,26 @@
1+
What's New in IDLE 3.14.0
2+
(since 3.13.0)
3+
Released on 2025-10-07
4+
=========================
5+
6+
7+
gh-127060: Set TERM environment variable to 'dumb' to not add ANSI escape
8+
sequences for text color in tracebacks. IDLE does not understand them.
9+
Patch by Victor Stinner.
10+
11+
gh-122392: Increase currently inadequate vertical spacing for the IDLE
12+
browsers (path, module, and stack) on high-resolution monitors.
13+
14+
115
What's New in IDLE 3.13.0
216
(since 3.12.0)
3-
Released on 2024-10-xx
17+
Released on 2024-10-07
418
=========================
519

20+
gh-120104: Fix padding in config and search dialog windows in IDLE.
21+
22+
gh-129873: Simplify displaying the IDLE doc by only copying the text
23+
section of idle.html to idlelib/help.html. Patch by Stan Ulbrych.
624

725
gh-120083: Add explicit black IDLE Hovertip foreground color needed for
826
recent macOS. Fixes Sonoma showing unreadable white on pale yellow.

Lib/idlelib/__main__.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
"""
66
import idlelib.pyshell
77
idlelib.pyshell.main()
8-
# This file does not work for 2.7; See issue 24212.

0 commit comments

Comments
 (0)