Skip to content

Commit bb5ff57

Browse files
Merge branch 'main' into base64-encode-wrapcol
2 parents a3bcc61 + 61fc72a commit bb5ff57

48 files changed

Lines changed: 1776 additions & 741 deletions

Some content is hidden

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

Doc/library/concurrent.futures.rst

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ the bytes over a shared :mod:`socket <socket>` or
308308

309309
.. note::
310310
The executor may replace uncaught exceptions from *initializer*
311-
with :class:`~concurrent.futures.interpreter.ExecutionFailed`.
311+
with :class:`~concurrent.interpreters.ExecutionFailed`.
312312

313313
Other caveats from parent :class:`ThreadPoolExecutor` apply here.
314314

@@ -320,11 +320,11 @@ likewise serializes the return value when sending it back.
320320
When a worker's current task raises an uncaught exception, the worker
321321
always tries to preserve the exception as-is. If that is successful
322322
then it also sets the ``__cause__`` to a corresponding
323-
:class:`~concurrent.futures.interpreter.ExecutionFailed`
323+
:class:`~concurrent.interpreters.ExecutionFailed`
324324
instance, which contains a summary of the original exception.
325325
In the uncommon case that the worker is not able to preserve the
326326
original as-is then it directly preserves the corresponding
327-
:class:`~concurrent.futures.interpreter.ExecutionFailed`
327+
:class:`~concurrent.interpreters.ExecutionFailed`
328328
instance instead.
329329

330330

@@ -720,15 +720,6 @@ Exception classes
720720

721721
.. versionadded:: 3.14
722722

723-
.. exception:: ExecutionFailed
724-
725-
Raised from :class:`~concurrent.futures.InterpreterPoolExecutor` when
726-
the given initializer fails or from
727-
:meth:`~concurrent.futures.Executor.submit` when there's an uncaught
728-
exception from the submitted task.
729-
730-
.. versionadded:: 3.14
731-
732723
.. currentmodule:: concurrent.futures.process
733724

734725
.. exception:: BrokenProcessPool

Doc/library/profiling.sampling.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,6 +1490,13 @@ Output options
14901490
named ``<format>_<PID>.<ext>`` (for example, ``flamegraph_12345.html``).
14911491
:option:`--heatmap` creates a directory named ``heatmap_<PID>``.
14921492

1493+
.. option:: --browser
1494+
1495+
Automatically open HTML output (:option:`--flamegraph` and
1496+
:option:`--heatmap`) in your default web browser after generation.
1497+
When profiling with :option:`--subprocesses`, only the main process
1498+
opens the browser; subprocess outputs are never auto-opened.
1499+
14931500

14941501
pstats display options
14951502
----------------------

Doc/tutorial/appendix.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ There are two variants of the interactive :term:`REPL`. The classic
1414
basic interpreter is supported on all platforms with minimal line
1515
control capabilities.
1616

17-
On Windows, or Unix-like systems with :mod:`curses` support,
18-
a new interactive shell is used by default since Python 3.13.
17+
Since Python 3.13, a new interactive shell is used by default.
1918
This one supports color, multiline editing, history browsing, and
2019
paste mode. To disable color, see :ref:`using-on-controlling-color` for
2120
details. Function keys provide some additional functionality.

Doc/whatsnew/3.15.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,13 @@ Optimizations
881881
(Contributed by Chris Eibl, Ken Jin, and Brandt Bucher in :gh:`143068`.
882882
Special thanks to the MSVC team including Hulon Jenkins.)
883883

884+
base64 & binascii
885+
-----------------
886+
887+
* CPython's underlying base64 implementation now encodes 2x faster and decodes 3x
888+
faster thanks to simple CPU pipelining optimizations.
889+
(Contributed by Gregory P. Smith and Serhiy Storchaka in :gh:`143262`.)
890+
884891
csv
885892
---
886893

Include/internal/pycore_opcode_metadata.h

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

0 commit comments

Comments
 (0)