From 3f99ebe1929c4636e09db53b14c07f8b01b18238 Mon Sep 17 00:00:00 2001 From: "Kent R. Spillner" Date: Wed, 12 Aug 2026 13:19:21 -0500 Subject: [PATCH 1/3] Fix the comment describing b_list (GH-28925) b_list points to the previously allocated block, not to the next one. --- Python/flowgraph.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Python/flowgraph.c b/Python/flowgraph.c index f135f243c74e2f..9a7b0b1eda28d9 100644 --- a/Python/flowgraph.c +++ b/Python/flowgraph.c @@ -41,9 +41,9 @@ typedef struct _PyCfgInstruction { typedef struct _PyCfgBasicblock { /* Each basicblock in a compilation unit is linked via b_list in the - reverse order that the block are allocated. b_list points to the next - block in this list, not to be confused with b_next, which is next by - control flow. */ + reverse order that blocks are allocated. b_list points to the + previously allocated block, not to be confused with b_next, which is + next by control flow. */ struct _PyCfgBasicblock *b_list; /* The label of this block if it is a jump target, -1 otherwise */ _PyJumpTargetLabel b_label; From 5dfa606af39d1e21d130205ce0efbb7a10e124f7 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 12 Aug 2026 21:47:40 +0200 Subject: [PATCH 2/3] gh-155561: Build most _testlimitedcapi files with Py_TARGET_ABI3T (#155570) The following files are not build with Py_TARGET_ABI3T: * Modules/_testlimitedcapi.c * Modules/_testlimitedcapi/heaptype_relative.c * Modules/_testlimitedcapi/vectorcall_limited.c --- Modules/_testlimitedcapi.c | 9 +++++++++ Modules/_testlimitedcapi/capsule.c | 3 +++ Modules/_testlimitedcapi/codec.c | 7 ++++--- Modules/_testlimitedcapi/file.c | 4 +++- Modules/_testlimitedcapi/heaptype_relative.c | 6 ++++-- Modules/_testlimitedcapi/import.c | 6 ++++-- Modules/_testlimitedcapi/list.c | 6 ++++-- Modules/_testlimitedcapi/long.c | 4 +++- Modules/_testlimitedcapi/object.c | 6 ++++-- Modules/_testlimitedcapi/parts.h | 6 ++++-- Modules/_testlimitedcapi/slots.c | 1 + Modules/_testlimitedcapi/sys.c | 6 ++---- Modules/_testlimitedcapi/unicode.c | 4 +++- Modules/_testlimitedcapi/vectorcall_limited.c | 6 ++++-- Modules/_testlimitedcapi/version.c | 7 +++++-- Modules/_testlimitedcapi/weakref.c | 4 +++- 16 files changed, 60 insertions(+), 25 deletions(-) diff --git a/Modules/_testlimitedcapi.c b/Modules/_testlimitedcapi.c index b602d3219f5a52..de8bed77d7d327 100644 --- a/Modules/_testlimitedcapi.c +++ b/Modules/_testlimitedcapi.c @@ -5,6 +5,15 @@ * standard Python regression test, via Lib/test/test_capi.py. */ +#include "pyconfig.h" // Py_GIL_DISABLED + +#ifdef Py_GIL_DISABLED + // Cannot test the limited C API +#else + // Use the oldest limited C API version +# define Py_LIMITED_API 0x03020000 +#endif + #include "_testlimitedcapi/parts.h" static PyMethodDef TestMethods[] = { diff --git a/Modules/_testlimitedcapi/capsule.c b/Modules/_testlimitedcapi/capsule.c index 07b85823f399ba..8dd870034023a3 100644 --- a/Modules/_testlimitedcapi/capsule.c +++ b/Modules/_testlimitedcapi/capsule.c @@ -1,5 +1,8 @@ #include "parts.h" +#include // free() + + static void capsule_destructor(PyObject *op) { diff --git a/Modules/_testlimitedcapi/codec.c b/Modules/_testlimitedcapi/codec.c index fdc18eedc2d288..44eecf99f678bb 100644 --- a/Modules/_testlimitedcapi/codec.c +++ b/Modules/_testlimitedcapi/codec.c @@ -1,7 +1,8 @@ #include "pyconfig.h" // Py_GIL_DISABLED - -// Need limited C API version 3.5 for PyCodec_NameReplaceErrors() -#if !defined(Py_GIL_DISABLED) && !defined(Py_LIMITED_API) +#ifdef Py_GIL_DISABLED +# define Py_TARGET_ABI3T 0x030f0000 +#else + // Need limited C API version 3.5 for PyCodec_NameReplaceErrors() # define Py_LIMITED_API 0x03050000 #endif diff --git a/Modules/_testlimitedcapi/file.c b/Modules/_testlimitedcapi/file.c index e082e3c6700ee7..c627c6ceaa201e 100644 --- a/Modules/_testlimitedcapi/file.c +++ b/Modules/_testlimitedcapi/file.c @@ -1,5 +1,7 @@ #include "pyconfig.h" // Py_GIL_DISABLED -#ifndef Py_GIL_DISABLED +#ifdef Py_GIL_DISABLED +# define Py_TARGET_ABI3T 0x030f0000 +#else // Need limited C API 3.13 for PyLong_AsInt() # define Py_LIMITED_API 0x030d0000 #endif diff --git a/Modules/_testlimitedcapi/heaptype_relative.c b/Modules/_testlimitedcapi/heaptype_relative.c index c02a52368b5324..a5e15026f028ca 100644 --- a/Modules/_testlimitedcapi/heaptype_relative.c +++ b/Modules/_testlimitedcapi/heaptype_relative.c @@ -1,6 +1,8 @@ -// Need limited C API version 3.15 for _DuringGC functions #include "pyconfig.h" // Py_GIL_DISABLED -#if !defined(Py_GIL_DISABLED) && !defined(Py_LIMITED_API) +#ifdef Py_GIL_DISABLED + // Cannot test the limited C API +#else + // Need limited C API version 3.15 for _DuringGC functions # define Py_LIMITED_API 0x030f0000 #endif diff --git a/Modules/_testlimitedcapi/import.c b/Modules/_testlimitedcapi/import.c index f572212ba88b76..48c477bf3ccc48 100644 --- a/Modules/_testlimitedcapi/import.c +++ b/Modules/_testlimitedcapi/import.c @@ -1,6 +1,8 @@ -// Need limited C API version 3.13 for PyImport_AddModuleRef() #include "pyconfig.h" // Py_GIL_DISABLED -#if !defined(Py_GIL_DISABLED) && !defined(Py_LIMITED_API) +#ifdef Py_GIL_DISABLED +# define Py_TARGET_ABI3T 0x030f0000 +#else + // Need limited C API version 3.13 for PyImport_AddModuleRef() # define Py_LIMITED_API 0x030d0000 #endif diff --git a/Modules/_testlimitedcapi/list.c b/Modules/_testlimitedcapi/list.c index ed492c3e719727..91c8ad60e3b990 100644 --- a/Modules/_testlimitedcapi/list.c +++ b/Modules/_testlimitedcapi/list.c @@ -1,6 +1,8 @@ -// Need limited C API version 3.13 for PyList_GetItemRef() #include "pyconfig.h" // Py_GIL_DISABLED -#if !defined(Py_GIL_DISABLED) && !defined(Py_LIMITED_API) +#ifdef Py_GIL_DISABLED +# define Py_TARGET_ABI3T 0x030f0000 +#else + // Need limited C API version 3.13 for PyList_GetItemRef() # define Py_LIMITED_API 0x030d0000 #endif diff --git a/Modules/_testlimitedcapi/long.c b/Modules/_testlimitedcapi/long.c index 99b9e96760d50d..7c6928dd234e32 100644 --- a/Modules/_testlimitedcapi/long.c +++ b/Modules/_testlimitedcapi/long.c @@ -1,5 +1,7 @@ #include "pyconfig.h" // Py_GIL_DISABLED -#ifndef Py_GIL_DISABLED +#ifdef Py_GIL_DISABLED +# define Py_TARGET_ABI3T 0x030f0000 +#else // Need limited C API 3.14 to test PyLong_AsInt64() # define Py_LIMITED_API 0x030e0000 #endif diff --git a/Modules/_testlimitedcapi/object.c b/Modules/_testlimitedcapi/object.c index da6fe3e4efa34c..594ba60f9abf20 100644 --- a/Modules/_testlimitedcapi/object.c +++ b/Modules/_testlimitedcapi/object.c @@ -1,6 +1,8 @@ -// Need limited C API version 3.13 for Py_GetConstant() #include "pyconfig.h" // Py_GIL_DISABLED -#if !defined(Py_GIL_DISABLED) && !defined(Py_LIMITED_API) +#ifdef Py_GIL_DISABLED +# define Py_TARGET_ABI3T 0x030f0000 +#else + // Need limited C API version 3.13 for Py_GetConstant() # define Py_LIMITED_API 0x030d0000 #endif diff --git a/Modules/_testlimitedcapi/parts.h b/Modules/_testlimitedcapi/parts.h index 35fbdea1d434e0..e34f7dd6809572 100644 --- a/Modules/_testlimitedcapi/parts.h +++ b/Modules/_testlimitedcapi/parts.h @@ -7,8 +7,10 @@ #include "pyconfig.h" // Py_GIL_DISABLED // Use the limited C API -#if !defined(Py_GIL_DISABLED) && !defined(Py_LIMITED_API) - // need limited C API version 3.5 for PyModule_AddFunctions() +#ifdef Py_GIL_DISABLED + // Cannot test the limited C API +#elif !defined(Py_LIMITED_API) + // Need limited C API version 3.5 for PyModule_AddFunctions() # define Py_LIMITED_API 0x03050000 #endif diff --git a/Modules/_testlimitedcapi/slots.c b/Modules/_testlimitedcapi/slots.c index 9abe53d2115464..2a887cd49f4c4b 100644 --- a/Modules/_testlimitedcapi/slots.c +++ b/Modules/_testlimitedcapi/slots.c @@ -1,3 +1,4 @@ +// Need limited C API version 3.15 for PyType_FromSlots() #define Py_LIMITED_API 0x030f0000 #include "parts.h" diff --git a/Modules/_testlimitedcapi/sys.c b/Modules/_testlimitedcapi/sys.c index cec7f8ab612019..618f4847c7ac6e 100644 --- a/Modules/_testlimitedcapi/sys.c +++ b/Modules/_testlimitedcapi/sys.c @@ -1,8 +1,6 @@ -#include "pyconfig.h" // Py_GIL_DISABLED // Need limited C API version 3.15 for PySys_GetAttr() etc -#if !defined(Py_GIL_DISABLED) && !defined(Py_LIMITED_API) -# define Py_LIMITED_API 0x030f0000 -#endif +#define Py_LIMITED_API 0x030f0000 + #include "parts.h" #include "util.h" diff --git a/Modules/_testlimitedcapi/unicode.c b/Modules/_testlimitedcapi/unicode.c index c7a23d5d1cbd71..980b192fdc3cbb 100644 --- a/Modules/_testlimitedcapi/unicode.c +++ b/Modules/_testlimitedcapi/unicode.c @@ -1,5 +1,7 @@ #include "pyconfig.h" // Py_GIL_DISABLED -#ifndef Py_GIL_DISABLED +#ifdef Py_GIL_DISABLED +# define Py_TARGET_ABI3T 0x030f0000 +#else // Need limited C API 3.14 to test PyUnicode_Equal() # define Py_LIMITED_API 0x030e0000 #endif diff --git a/Modules/_testlimitedcapi/vectorcall_limited.c b/Modules/_testlimitedcapi/vectorcall_limited.c index 84362d523f4963..443c4aca28e3ae 100644 --- a/Modules/_testlimitedcapi/vectorcall_limited.c +++ b/Modules/_testlimitedcapi/vectorcall_limited.c @@ -1,8 +1,10 @@ /* Test Vectorcall in the limited API */ -// Need limited C API version 3.12 for PyObject_Vectorcall() #include "pyconfig.h" // Py_GIL_DISABLED -#if !defined(Py_GIL_DISABLED) && !defined(Py_LIMITED_API) +#ifdef Py_GIL_DISABLED + // Cannot test the limited C API +#else + // Need limited C API version 3.12 for PyObject_Vectorcall() # define Py_LIMITED_API 0x030c0000 #endif diff --git a/Modules/_testlimitedcapi/version.c b/Modules/_testlimitedcapi/version.c index 57cd6e4e928ea3..d2a4551159165c 100644 --- a/Modules/_testlimitedcapi/version.c +++ b/Modules/_testlimitedcapi/version.c @@ -1,8 +1,11 @@ /* Test version macros in the limited API */ #include "pyconfig.h" // Py_GIL_DISABLED -#ifndef Py_GIL_DISABLED -# define Py_LIMITED_API 0x030e0000 // Added in 3.14 +#ifdef Py_GIL_DISABLED +# define Py_TARGET_ABI3T 0x030f0000 +#else + // Need limited C API version 3.14 for Py_PACK_VERSION() +# define Py_LIMITED_API 0x030e0000 #endif #include "parts.h" diff --git a/Modules/_testlimitedcapi/weakref.c b/Modules/_testlimitedcapi/weakref.c index e7f9d54d1a0d59..a25e39e21af374 100644 --- a/Modules/_testlimitedcapi/weakref.c +++ b/Modules/_testlimitedcapi/weakref.c @@ -1,5 +1,7 @@ #include "pyconfig.h" // Py_GIL_DISABLED -#ifndef Py_GIL_DISABLED +#ifdef Py_GIL_DISABLED +# define Py_TARGET_ABI3T 0x030f0000 +#else // Need limited C API 3.5 for PyModule_AddFunctions() # define Py_LIMITED_API 0x03050000 #endif From bc31217fe432b5ede1485bec2b62b2c67a48eee4 Mon Sep 17 00:00:00 2001 From: Addison Snelling Date: Wed, 12 Aug 2026 20:16:47 +0000 Subject: [PATCH 3/3] gh-90982: Document prefixes argument on site.getsitepackages (GH-31546) --- Doc/library/site.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Doc/library/site.rst b/Doc/library/site.rst index 11a5484c2b1336..6f989e2b21b8bf 100644 --- a/Doc/library/site.rst +++ b/Doc/library/site.rst @@ -449,12 +449,19 @@ Module contents Also processes :file:`.start` files. See :ref:`site-start-files`. -.. function:: getsitepackages() +.. function:: getsitepackages(prefixes=None) Return a list containing all global site-packages directories. + For each directory present in *prefixes* (or :data:`PREFIXES` if *prefixes* + is ``None``), this function will find its site-packages subdirectory + depending on the system environment, and will return a list of full paths. + .. versionadded:: 3.2 + .. versionchanged:: 3.3 + Add the optional *prefixes* argument. + .. function:: getuserbase()