Merge branch 'main' into ww/807-features

woodruffw · web-flow · commit 28e4fe41540a · 2026-01-22T15:36:17.000-05:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -673,6 +673,7 @@ peps/pep-0791.rst  @vstinner
 peps/pep-0792.rst  @dstufft
 peps/pep-0793.rst  @encukou
 peps/pep-0794.rst  @brettcannon
+peps/pep-0797.rst  @ZeroIntensity
 peps/pep-0798.rst  @JelleZijlstra
 peps/pep-0799.rst  @pablogsal
 peps/pep-0800.rst  @JelleZijlstra
@@ -694,6 +695,7 @@ peps/pep-0816.rst  @brettcannon
 # ...
 peps/pep-0819.rst  @emmatyping
 peps/pep-0820.rst  @encukou
+peps/pep-0822.rst  @methane
 # ...
 peps/pep-2026.rst  @hugovk
 # ...
diff --git a/README.rst b/README.rst
@@ -20,6 +20,12 @@ Shortcut redirects are also available.
 For example, ``https://peps.python.org/8`` redirects to the canonical link.
 
 
+API
+===
+
+Several data files are available at https://peps.python.org/api/
+
+
 Contributing to PEPs
 ====================
 
diff --git a/pep_sphinx_extensions/pep_processor/html/pep_html_builder.py b/pep_sphinx_extensions/pep_processor/html/pep_html_builder.py
@@ -33,7 +33,8 @@ def get_doc_context(self, docname: str, body: str, _metatags: str) -> dict:
         toc_tree = self.env.tocs[docname].deepcopy()
         if len(toc_tree) and len(toc_tree[0]) > 1:
             toc_tree = toc_tree[0][1]  # don't include document title
-            del toc_tree[0]  # remove contents node
+            if docname.startswith("pep-"):
+                del toc_tree[0]  # remove contents node from PEPs
             for node in toc_tree.findall(nodes.reference):
                 node["refuri"] = node["anchorname"] or '#'  # fix targets
             toc = self.render_partial(toc_tree)["fragment"]
diff --git a/peps/api/index.rst b/peps/api/index.rst
@@ -207,3 +207,9 @@ for example:
        ]
      }
    }
+
+release-schedule.ics
+--------------------
+
+An iCalendar file of Python release dates is available at
+https://peps.python.org/api/release-schedule.ics.
diff --git a/peps/pep-0387.rst b/peps/pep-0387.rst
@@ -146,8 +146,12 @@ Making Incompatible Changes
 Making an incompatible change is a gradual process performed over
 several releases:
 
-1. :pep:`PEP 1: Start with an idea <1#start-with-an-idea-for-python>` discussion.
-   If the discussion reaches consensus that acceptance is possible a PEP or
+1. Discuss the change.
+   Depending on the degree of incompatibility, this could be on
+   `Discourse <https://discuss.python.org/>`__,
+   the `issue tracker <https://github.com/python/cpython/issues/>`__,
+   or in an appropriate workgroup or SIG.
+   If the discussion reaches consensus a :pep:`PEP <1>` or
    similar document may be written.
    Hopefully users of the affected API will pipe up to comment.
 
diff --git a/peps/pep-0523.rst b/peps/pep-0523.rst
@@ -239,11 +239,11 @@ implementing their own JITs for CPython by utilizing the proposed API.
 Other JITs
 ''''''''''
 
-It should be mentioned that the Pyston team was consulted on an
+It should be mentioned that the Pyston [#pyston]_ team was consulted on an
 earlier version of this PEP that was more JIT-specific and they were
 not interested in utilizing the changes proposed because they want
 control over memory layout they had no interest in directly supporting
-CPython itself. An informal discussion with a developer on the PyPy
+CPython itself. An informal discussion with a developer on the PyPy [#pypy]_
 team led to a similar comment.
 
 Numba [#numba]_, on the other hand, suggested that they would be
diff --git a/peps/pep-0534.rst b/peps/pep-0534.rst
@@ -3,7 +3,7 @@ Title: Improved Errors for Missing Standard Library Modules
 Author: Tomáš Orsava <tomas.n@orsava.cz>,
         Petr Viktorin <encukou@gmail.com>,
         Alyssa Coghlan <ncoghlan@gmail.com>
-Status: Deferred
+Status: Withdrawn
 Type: Standards Track
 Created: 05-Sep-2016
 Post-History:
@@ -22,16 +22,24 @@ and providing more informative error messages to users when attempts to import
 standard library modules fail.
 
 
-PEP Deferral
-============
+PEP Withdrawal
+==============
+
+The authors have withdrawn this PEP as the core ideas have been implemented over
+time. The relevant features include the :data:`sys.stdlib_module_names`
+API for listing standard library modules, the
+:external+py3.15:option:`--with-missing-stdlib-config`
+configure option for distributors to provide custom error messages,
+and improved :exc:`ModuleNotFoundError` error messages for missing
+:term:`standard library` modules, for example:
 
-The PEP authors aren't actively working on this PEP, so if improving these
-error messages is an idea that you're interested in pursuing, please get in
-touch! (e.g. by posting to the python-dev mailing list).
+.. code-block:: pycon
 
-The key piece of open work is determining how to get the autoconf and Visual
-Studio build processes to populate the sysconfig metadata file with the lists
-of expected and optional standard library modules.
+   >>> import zlib
+   Traceback (most recent call last):
+     File "<python-input-0>", line 1, in <module>
+       import zlib
+   ModuleNotFoundError: Standard library module 'zlib' was not found
 
 
 Motivation
diff --git a/peps/pep-0686.rst b/peps/pep-0686.rst
@@ -2,7 +2,7 @@ PEP: 686
 Title: Make UTF-8 mode default
 Author: Inada Naoki <songofacandy@gmail.com>
 Discussions-To: https://discuss.python.org/t/14737
-Status: Accepted
+Status: Final
 Type: Standards Track
 Created: 18-Mar-2022
 Python-Version: 3.15
diff --git a/peps/pep-0788.rst b/peps/pep-0788.rst
@@ -39,7 +39,7 @@ interpreter by preventing finalization. For example:
 
         // Now we can call Python code, without worrying about the thread
         // hanging due to finalization.
-        if (PyRun_SimpleString("print('My hovercraft is full of eels') < 0) {
+        if (PyRun_SimpleString("print('My hovercraft is full of eels')") < 0) {
             PyErr_Print();
         }
 
diff --git a/peps/pep-0790.rst b/peps/pep-0790.rst
@@ -39,13 +39,14 @@ Actual:
 - 3.15.0 alpha 1: Tuesday, 2025-10-14
 - 3.15.0 alpha 2: Wednesday, 2025-11-19
 - 3.15.0 alpha 3: Tuesday, 2025-12-16
+- 3.15.0 alpha 4: Tuesday, 2026-01-13
+- 3.15.0 alpha 5: Wednesday, 2026-01-14
 
 Expected:
 
-- 3.15.0 alpha 4: Tuesday, 2026-01-13
-- 3.15.0 alpha 5: Tuesday, 2026-02-10
-- 3.15.0 alpha 6: Tuesday, 2026-03-10
-- 3.15.0 alpha 7: Tuesday, 2026-04-07
+- 3.15.0 alpha 6: Tuesday, 2026-02-10
+- 3.15.0 alpha 7: Tuesday, 2026-03-10
+- 3.15.0 alpha 8: Tuesday, 2026-04-07
 - 3.15.0 beta 1: Tuesday, 2026-05-05
   (No new features beyond this point.)
 - 3.15.0 beta 2: Tuesday, 2026-05-26
diff --git a/peps/pep-0797.rst b/peps/pep-0797.rst
diff --git a/peps/pep-0819.rst b/peps/pep-0819.rst
diff --git a/peps/pep-0822.rst b/peps/pep-0822.rst
diff --git a/release_management/python-releases.toml b/release_management/python-releases.toml

Original file line number	Diff line number	Diff line change
`@@ -207,3 +207,9 @@ for example:`
`207`	`207`	`]`
`208`	`208`	`}`
`209`	`209`	`}`
	`210`	`+`
	`211`	`+release-schedule.ics`
	`212`	`+--------------------`
	`213`	`+`
	`214`	`+An iCalendar file of Python release dates is available at`
	`215`	`+https://peps.python.org/api/release-schedule.ics.`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ interpreter by preventing finalization. For example:`
`39`	`39`
`40`	`40`	`// Now we can call Python code, without worrying about the thread`
`41`	`41`	`// hanging due to finalization.`
`42`		`- if (PyRun_SimpleString("print('My hovercraft is full of eels') < 0) {`
	`42`	`+ if (PyRun_SimpleString("print('My hovercraft is full of eels')") < 0) {`
`43`	`43`	`PyErr_Print();`
`44`	`44`	`}`
`45`	`45`