Merge branch 'main' into gh-142654

Author: kemingy

.gitignore

@@ -45,6 +45,7 @@ gmon.out
 .pytest_cache/
 .ruff_cache/
 .DS_Store
+.pixi/
 
 *.exe
 

Doc/deprecations/c-api-pending-removal-in-3.20.rst

@@ -3,7 +3,7 @@ Pending removal in Python 3.20
 
 * :c:func:`!_PyObject_CallMethodId`, :c:func:`!_PyObject_GetAttrId` and
   :c:func:`!_PyUnicode_FromId` are deprecated since 3.15 and will be removed in
-  3.20. Instead, use :c:func:`PyUnicode_FromString()` and cache the result in
+  3.20. Instead, use :c:func:`PyUnicode_InternFromString()` and cache the result in
   the module state, then call :c:func:`PyObject_CallMethod` or
   :c:func:`PyObject_GetAttr`.
   (Contributed by Victor Stinner in :gh:`141049`.)

Doc/library/ctypes.rst

@@ -1388,6 +1388,9 @@ On Linux, :func:`~ctypes.util.find_library` tries to run external programs
 (``/sbin/ldconfig``, ``gcc``, ``objdump`` and ``ld``) to find the library file.
 It returns the filename of the library file.
 
+Note that if the output of these programs does not correspond to the dynamic
+linker used by Python, the result of this function may be misleading.
+
 .. versionchanged:: 3.6
    On Linux, the value of the environment variable ``LD_LIBRARY_PATH`` is used
    when searching for libraries, if a library cannot be found by any other means.
@@ -2132,6 +2135,8 @@ Utility functions
 
    The exact functionality is system dependent.
 
+   See :ref:`ctypes-finding-shared-libraries` for complete documentation.
+
 
 .. function:: find_msvcrt()
    :module: ctypes.util

Doc/whatsnew/3.15.rst

@@ -1226,7 +1226,7 @@ Deprecated C APIs
 
 * :c:func:`!_PyObject_CallMethodId`, :c:func:`!_PyObject_GetAttrId` and
   :c:func:`!_PyUnicode_FromId` are deprecated since 3.15 and will be removed in
-  3.20. Instead, use :c:func:`PyUnicode_FromString()` and cache the result in
+  3.20. Instead, use :c:func:`PyUnicode_InternFromString()` and cache the result in
   the module state, then call :c:func:`PyObject_CallMethod` or
   :c:func:`PyObject_GetAttr`.
   (Contributed by Victor Stinner in :gh:`141049`.)

InternalDocs/README.md

@@ -11,6 +11,11 @@ it is not, please report that through the
 [issue tracker](https://github.com/python/cpython/issues).
 
 
+General Resources
+---
+
+- [Source Code Structure](structure.md)
+
 Compiling Python Source Code
 ---
 

InternalDocs/structure.md

@@ -0,0 +1,40 @@
+# CPython source code
+
+This section gives an overview of CPython's code structure and provides
+a summary of file locations for modules and built-ins.
+
+
+## Source code layout
+
+For a Python module, the typical layout is:
+
+* `Lib/<module>.py`
+* `Modules/_<module>.c` (if there's also a C accelerator module)
+* `Lib/test/test_<module>.py`
+* `Doc/library/<module>.rst`
+
+For an extension module, the typical layout is:
+
+* `Modules/<module>module.c`
+* `Lib/test/test_<module>.py`
+* `Doc/library/<module>.rst`
+
+For builtin types, the typical layout is:
+
+* `Objects/<builtin>object.c`
+* `Lib/test/test_<builtin>.py`
+* [`Doc/library/stdtypes.rst`](../Doc/library/stdtypes.rst)
+
+For builtin functions, the typical layout is:
+
+* [`Python/bltinmodule.c`](../Python/bltinmodule.c)
+* [`Lib/test/test_builtin.py`](../Lib/test/test_builtin.py)
+* [`Doc/library/functions.rst`](../Doc/library/functions.rst)
+
+Some exceptions to these layouts are:
+
+* built-in type `int` is at [`Objects/longobject.c`](../Objects/longobject.c)
+* built-in type `str` is at [`Objects/unicodeobject.c`](../Objects/unicodeobject.c)
+* built-in module `sys` is at [`Python/sysmodule.c`](../Python/sysmodule.c)
+* built-in module `marshal` is at [`Python/marshal.c`](../Python/marshal.c)
+* Windows-only module `winreg` is at [`PC/winreg.c`](../PC/winreg.c)

Lib/test/test_io/test_textio.py

@@ -1544,6 +1544,22 @@ def write(self, data):
         self.assertEqual([b"abcdef", b"middle", b"g"*chunk_size],
                          buf._write_stack)
 
+    def test_issue142594(self):
+        wrapper = None
+        detached = False
+        class ReentrantRawIO(self.RawIOBase):
+            @property
+            def closed(self):
+                nonlocal detached
+                if wrapper is not None and not detached:
+                    detached = True
+                    wrapper.detach()
+                return False
+
+        raw = ReentrantRawIO()
+        wrapper = self.TextIOWrapper(raw)
+        wrapper.close()  # should not crash
+
 
 class PyTextIOWrapperTest(TextIOWrapperTest, PyTestCase):
     shutdown_error = "LookupError: unknown encoding: ascii"

Misc/NEWS.d/next/C_API/2025-12-03-14-41-07.gh-issue-141049.VuAUe2.rst

@@ -1,5 +1,5 @@
 :c:func:`!_PyObject_CallMethodId`, :c:func:`!_PyObject_GetAttrId` and
 :c:func:`!_PyUnicode_FromId` are deprecated since 3.15 and will be removed in
-3.20. Instead, use :c:func:`PyUnicode_FromString()` and cache the result in
+3.20. Instead, use :c:func:`PyUnicode_InternFromString()` and cache the result in
 the module state, then call :c:func:`PyObject_CallMethod` or
 :c:func:`PyObject_GetAttr`. Patch by Victor Stinner.

Misc/NEWS.d/next/Library/2025-12-14-18-30-48.gh-issue-142594.belDmD.rst

@@ -0,0 +1,2 @@
+Fix crash in ``TextIOWrapper.close()`` when the underlying buffer's
+``closed`` property calls :meth:`~io.TextIOBase.detach`.

Modules/_io/textio.c

@@ -3150,6 +3150,9 @@ _io_TextIOWrapper_close_impl(textio *self)
     if (r > 0) {
         Py_RETURN_NONE; /* stream already closed */
     }
+    if (self->detached) {
+        Py_RETURN_NONE; /* gh-142594 null pointer issue */
+    }
     else {
         PyObject *exc = NULL;
         if (self->finalizing) {