Merge branch 'main' into csv-sniffer-counter-set

Author: maurycy

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-    "image": "ghcr.io/python/devcontainer:2025.05.29.15334414373",
+    "image": "ghcr.io/python/devcontainer:latest",
     "onCreateCommand": [
         // Install common tooling.
         "dnf",

.github/workflows/build.yml

@@ -270,7 +270,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04]
-        openssl_ver: [3.0.16, 3.1.8, 3.2.4, 3.3.3, 3.4.1]
+        openssl_ver: [3.0.17, 3.2.5, 3.3.4, 3.4.2, 3.5.2]
         # See Tools/ssl/make_ssl_data.py for notes on adding a new version
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}

.github/workflows/mypy.yml

@@ -13,16 +13,17 @@ on:
       - "Lib/test/libregrtest/**"
       - "Lib/tomllib/**"
       - "Misc/mypy/**"
-      - "Tools/build/mypy.ini"
       - "Tools/build/check_extension_modules.py"
+      - "Tools/build/check_warnings.py"
       - "Tools/build/compute-changes.py"
       - "Tools/build/deepfreeze.py"
+      - "Tools/build/generate-build-details.py"
       - "Tools/build/generate_sbom.py"
       - "Tools/build/generate_stdlib_module_names.py"
-      - "Tools/build/generate-build-details.py"
-      - "Tools/build/verify_ensurepip_wheels.py"
-      - "Tools/build/update_file.py"
+      - "Tools/build/mypy.ini"
       - "Tools/build/umarshal.py"
+      - "Tools/build/update_file.py"
+      - "Tools/build/verify_ensurepip_wheels.py"
       - "Tools/cases_generator/**"
       - "Tools/clinic/**"
       - "Tools/jit/**"

Doc/bugs.rst

@@ -37,8 +37,8 @@ tracker <https://github.com/python/python-docs-theme>`_.
    `Helping with Documentation <https://devguide.python.org/docquality/#helping-with-documentation>`_
       Comprehensive guide for individuals that are interested in contributing to Python documentation.
 
-   `Documentation Translations <https://devguide.python.org/documentation/translating/>`_
-      A list of GitHub pages for documentation translation and their primary contacts.
+   `Documentation Translations <https://devguide.python.org/documentation/translations/translating/#translation-coordinators>`_
+      A list of GitHub pages for documentation translation and their coordination teams.
 
 
 .. _using-the-tracker:

Doc/library/cmdlinelibs.rst

@@ -1,7 +1,7 @@
 .. _cmdlinelibs:
 
 ********************************
-Command Line Interface Libraries
+Command-line interface libraries
 ********************************
 
 The modules described in this chapter assist with implementing
@@ -19,3 +19,4 @@ Here's an overview:
    curses.rst
    curses.ascii.rst
    curses.panel.rst
+   cmd.rst

Doc/library/concurrent.futures.rst

@@ -101,10 +101,10 @@ Executor Objects
       executor has started running will be completed prior to this method
       returning. The remaining futures are cancelled.
 
-      You can avoid having to call this method explicitly if you use the
-      :keyword:`with` statement, which will shutdown the :class:`Executor`
-      (waiting as if :meth:`Executor.shutdown` were called with *wait* set to
-      ``True``)::
+      You can avoid having to call this method explicitly if you use the executor
+      as a :term:`context manager` via the  :keyword:`with` statement, which
+      will shutdown the :class:`Executor` (waiting as if :meth:`Executor.shutdown`
+      were called with *wait* set to ``True``)::
 
          import shutil
          with ThreadPoolExecutor(max_workers=4) as e:

Doc/library/constants.rst

@@ -97,15 +97,17 @@ should not be used in programs.
           exit(code=None)
 
    Objects that when printed, print a message like "Use quit() or Ctrl-D
-   (i.e. EOF) to exit", and when called, raise :exc:`SystemExit` with the
+   (i.e. EOF) to exit", and when accessed directly in the interactive
+   interpreter or called as functions, raise :exc:`SystemExit` with the
    specified exit code.
 
 .. data:: help
    :noindex:
 
    Object that when printed, prints the message "Type help() for interactive
-   help, or help(object) for help about object.", and when called,
-   acts as described :func:`elsewhere <help>`.
+   help, or help(object) for help about object.", and when accessed directly
+   in the interactive interpreter, invokes the built-in help system
+   (see :func:`help`).
 
 .. data:: copyright
           credits

Doc/library/frameworks.rst

@@ -1,18 +1,13 @@
+:orphan:
+
 .. _frameworks:
 
 ******************
-Program Frameworks
+Program frameworks
 ******************
 
-The modules described in this chapter are frameworks that will largely dictate
-the structure of your program.  Currently the modules described  here are all
-oriented toward writing command-line interfaces.
-
-The full list of modules described in this chapter is:
-
-
-.. toctree::
+This chapter is no longer maintained, and the modules it contained have been moved to their respective topical documentation.
 
-   turtle.rst
-   cmd.rst
-   shlex.rst
+* :mod:`cmd` — :doc:`Command Line Interface Libraries <./cmdlinelibs>`
+* :mod:`shlex` — :doc:`Unix Specific Services <./unix>`
+* :mod:`turtle` — :doc:`Graphical User Interfaces with Tk <./tk>`

Doc/library/functions.rst

@@ -1422,38 +1422,10 @@ are always available.  They are listed here in alphabetical order.
 
    *errors* is an optional string that specifies how encoding and decoding
    errors are to be handled—this cannot be used in binary mode.
-   A variety of standard error handlers are available
-   (listed under :ref:`error-handlers`), though any
-   error handling name that has been registered with
+   A variety of standard error handlers are available,
+   though any error handling name that has been registered with
    :func:`codecs.register_error` is also valid.  The standard names
-   include:
-
-   * ``'strict'`` to raise a :exc:`ValueError` exception if there is
-     an encoding error.  The default value of ``None`` has the same
-     effect.
-
-   * ``'ignore'`` ignores errors.  Note that ignoring encoding errors
-     can lead to data loss.
-
-   * ``'replace'`` causes a replacement marker (such as ``'?'``) to be inserted
-     where there is malformed data.
-
-   * ``'surrogateescape'`` will represent any incorrect bytes as low
-     surrogate code units ranging from U+DC80 to U+DCFF.
-     These surrogate code units will then be turned back into
-     the same bytes when the ``surrogateescape`` error handler is used
-     when writing data.  This is useful for processing files in an
-     unknown encoding.
-
-   * ``'xmlcharrefreplace'`` is only supported when writing to a file.
-     Characters not supported by the encoding are replaced with the
-     appropriate XML character reference :samp:`&#{nnn};`.
-
-   * ``'backslashreplace'`` replaces malformed data by Python's backslashed
-     escape sequences.
-
-   * ``'namereplace'`` (also only supported when writing)
-     replaces unsupported characters with ``\N{...}`` escape sequences.
+   can be found in :ref:`error-handlers`.
 
    .. index::
       single: universal newlines; open() built-in function
@@ -1562,13 +1534,19 @@ are always available.  They are listed here in alphabetical order.
    .. versionchanged:: 3.11
       The ``'U'`` mode has been removed.
 
-.. function:: ord(c)
+.. function:: ord(character, /)
 
-   Given a string representing one Unicode character, return an integer
-   representing the Unicode code point of that character.  For example,
+   Return the ordinal value of a character.
+
+   If the argument is a one-character string, return the Unicode code point
+   of that character.  For example,
    ``ord('a')`` returns the integer ``97`` and ``ord('€')`` (Euro sign)
    returns ``8364``.  This is the inverse of :func:`chr`.
 
+   If the argument is a :class:`bytes` or :class:`bytearray` object of
+   length 1, return its single byte value.
+   For example, ``ord(b'a')`` returns the integer ``97``.
+
 
 .. function:: pow(base, exp, mod=None)
 

Doc/library/index.rst

@@ -63,7 +63,6 @@ the `Python Package Index <https://pypi.org>`_.
    internet.rst
    mm.rst
    i18n.rst
-   frameworks.rst
    tk.rst
    development.rst
    debug.rst