Mailman 3 August 2026 - Python-checkins

gh-155418: Fix TaskGroup hang when a task cancels it before suspending (#155421)
by kumaraditya303 Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/8e92bf54e7ae55497a1b193b875d07e10e… commit: 8e92bf54e7ae55497a1b193b875d07e10e52d0e1 branch: main author: Timofei Ivankov <128279579+deadlovelll(a)users.noreply.github.com> committer: kumaraditya303 <kumaraditya(a)python.org> date: 2026-08-31T18:24:03Z summary: gh-155418: Fix TaskGroup hang when a task cancels it before suspending (#155421) files: A Misc/NEWS.d/next/Library/2026-08-09-14-27-23.gh-issue-155418.kCXUIG.rst M Lib/asyncio/taskgroups.py M Lib/test/test_asyncio/test_taskgroups.py diff --git a/Lib/asyncio/taskgroups.py b/Lib/asyncio/taskgroups.py index 955e8e677eac1a..2debb4d5849e68 100644 --- a/Lib/asyncio/taskgroups.py +++ b/Lib/asyncio/taskgroups.py @@ -239,6 +239,9 @@ def create_task(self, coro, **kwargs): # the current task too early. gh-128550, gh-128588 self._tasks.add(task) task.add_done_callback(self._on_task_done) + # gh-155418: an eager task can cancel the group before joining _tasks + if self._aborting and not task.done(): + task.cancel() try: return task finally: diff --git a/Lib/test/test_asyncio/test_taskgroups.py b/Lib/test/test_asyncio/test_taskgroups.py index 983e1a7dc53e6f..1515672393816b 100644 --- a/Lib/test/test_asyncio/test_taskgroups.py +++ b/Lib/test/test_asyncio/test_taskgroups.py @@ -1187,6 +1187,17 @@ async def test_taskgroup_cancel_before_create_task(self): with self.assertRaises(RuntimeError): tg.create_task(asyncio.sleep(1)) + async def test_taskgroup_cancel_from_child_before_first_suspension(self): + # gh-155418: an eager task can cancel the group before joining _tasks + async def child(tg): + tg.cancel() + await asyncio.sleep(10) + self.fail("the child was not cancelled") + + async with asyncio.TaskGroup() as tg: + task = tg.create_task(child(tg)) + self.assertTrue(task.cancelled()) + async def test_taskgroup_cancel_keeps_outer_cancellation(self): # gh-155433: any cancellation from outside the group must propagate. async def child(): diff --git a/Misc/NEWS.d/next/Library/2026-08-09-14-27-23.gh-issue-155418.kCXUIG.rst b/Misc/NEWS.d/next/Library/2026-08-09-14-27-23.gh-issue-155418.kCXUIG.rst new file mode 100644 index 00000000000000..7fe30ddb1ce8b7 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-08-09-14-27-23.gh-issue-155418.kCXUIG.rst @@ -0,0 +1,2 @@ +Fix :class:`asyncio.TaskGroup` hang when a task created by +:func:`asyncio.eager_task_factory` cancels the group before suspending.

1 0

[3.14] gh-156101: Don't set the result in error in PyLong_AsInt32() (GH-156727) (#156729)
by vstinner Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/e57c494fb454c79b8aa14c6510189c5b0c… commit: e57c494fb454c79b8aa14c6510189c5b0c2656a1 branch: 3.14 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: vstinner <vstinner(a)python.org> date: 2026-08-31T18:17:48Z summary: [3.14] gh-156101: Don't set the result in error in PyLong_AsInt32() (GH-156727) (#156729) gh-156101: Don't set the result in error in PyLong_AsInt32() (GH-156727) Don't set the result in error in PyLong_AsInt32(), PyLong_AsUInt32(), PyLong_AsInt64() and PyLong_AsUInt64(). Leave the result unchanged in this case. (cherry picked from commit 63f662663acd3751632e75fb03e7f1e52c4bb5e5) Co-authored-by: Victor Stinner <vstinner(a)python.org> files: A Misc/NEWS.d/next/C_API/2026-08-31-19-14-15.gh-issue-156101.d4PSIF.rst M Modules/_testlimitedcapi/long.c M Objects/longobject.c diff --git a/Misc/NEWS.d/next/C_API/2026-08-31-19-14-15.gh-issue-156101.d4PSIF.rst b/Misc/NEWS.d/next/C_API/2026-08-31-19-14-15.gh-issue-156101.d4PSIF.rst new file mode 100644 index 000000000000000..68822d6702e3bc2 --- /dev/null +++ b/Misc/NEWS.d/next/C_API/2026-08-31-19-14-15.gh-issue-156101.d4PSIF.rst @@ -0,0 +1,4 @@ +Don't set the result in error in :c:func:`PyLong_AsInt32`, +:c:func:`PyLong_AsUInt32`, :c:func:`PyLong_AsInt64` and +:c:func:`PyLong_AsUInt64`. Leave the result unchanged in this case. Patch by +Victor Stinner. diff --git a/Modules/_testlimitedcapi/long.c b/Modules/_testlimitedcapi/long.c index 99b9e96760d50df..01d762165867421 100644 --- a/Modules/_testlimitedcapi/long.c +++ b/Modules/_testlimitedcapi/long.c @@ -762,8 +762,9 @@ static PyObject * pylong_asint32(PyObject *module, PyObject *arg) { NULLABLE(arg); - int32_t value; + int32_t value = UNINITIALIZED_INT; if (PyLong_AsInt32(arg, &value) < 0) { + assert(value == UNINITIALIZED_INT); return NULL; } return PyLong_FromInt32(value); @@ -773,8 +774,9 @@ static PyObject * pylong_asuint32(PyObject *module, PyObject *arg) { NULLABLE(arg); - uint32_t value; + uint32_t value = UNINITIALIZED_INT; if (PyLong_AsUInt32(arg, &value) < 0) { + assert(value == UNINITIALIZED_INT); return NULL; } return PyLong_FromUInt32(value); @@ -785,8 +787,9 @@ static PyObject * pylong_asint64(PyObject *module, PyObject *arg) { NULLABLE(arg); - int64_t value; + int64_t value = UNINITIALIZED_INT; if (PyLong_AsInt64(arg, &value) < 0) { + assert(value == UNINITIALIZED_INT); return NULL; } return PyLong_FromInt64(value); @@ -796,8 +799,9 @@ static PyObject * pylong_asuint64(PyObject *module, PyObject *arg) { NULLABLE(arg); - uint64_t value; + uint64_t value = UNINITIALIZED_INT; if (PyLong_AsUInt64(arg, &value) < 0) { + assert(value == UNINITIALIZED_INT); return NULL; } return PyLong_FromUInt64(value); diff --git a/Objects/longobject.c b/Objects/longobject.c index daa1f9005e206ee..5182615ff2d7949 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -6697,58 +6697,62 @@ PyObject* PyLong_FromUInt64(uint64_t value) PYLONG_FROM_UINT(uint64_t, value); } -#define LONG_TO_INT(obj, value, type_name) \ +#define LONG_TO_INT(type, obj, result) \ do { \ + type value; \ int flags = (Py_ASNATIVEBYTES_NATIVE_ENDIAN \ | Py_ASNATIVEBYTES_ALLOW_INDEX); \ - Py_ssize_t bytes = PyLong_AsNativeBytes(obj, value, sizeof(*value), flags); \ + Py_ssize_t bytes = PyLong_AsNativeBytes(obj, &value, sizeof(value), flags); \ if (bytes < 0) { \ return -1; \ } \ - if ((size_t)bytes > sizeof(*value)) { \ + if ((size_t)bytes > sizeof(value)) { \ PyErr_SetString(PyExc_OverflowError, \ - "Python int too large to convert to " type_name); \ + "Python int too large to convert to C " #type); \ return -1; \ } \ + *result = value; \ return 0; \ } while (0) -int PyLong_AsInt32(PyObject *obj, int32_t *value) +int PyLong_AsInt32(PyObject *obj, int32_t *result) { - LONG_TO_INT(obj, value, "C int32_t"); + LONG_TO_INT(int32_t, obj, result); } -int PyLong_AsInt64(PyObject *obj, int64_t *value) +int PyLong_AsInt64(PyObject *obj, int64_t *result) { - LONG_TO_INT(obj, value, "C int64_t"); + LONG_TO_INT(int64_t, obj, result); } -#define LONG_TO_UINT(obj, value, type_name) \ +#define LONG_TO_UINT(type, obj, result) \ do { \ + type value; \ int flags = (Py_ASNATIVEBYTES_NATIVE_ENDIAN \ | Py_ASNATIVEBYTES_UNSIGNED_BUFFER \ | Py_ASNATIVEBYTES_REJECT_NEGATIVE \ | Py_ASNATIVEBYTES_ALLOW_INDEX); \ - Py_ssize_t bytes = PyLong_AsNativeBytes(obj, value, sizeof(*value), flags); \ + Py_ssize_t bytes = PyLong_AsNativeBytes(obj, &value, sizeof(value), flags); \ if (bytes < 0) { \ return -1; \ } \ - if ((size_t)bytes > sizeof(*value)) { \ + if ((size_t)bytes > sizeof(value)) { \ PyErr_SetString(PyExc_OverflowError, \ - "Python int too large to convert to " type_name); \ + "Python int too large to convert to C " #type); \ return -1; \ } \ + *result = value; \ return 0; \ } while (0) -int PyLong_AsUInt32(PyObject *obj, uint32_t *value) +int PyLong_AsUInt32(PyObject *obj, uint32_t *result) { - LONG_TO_UINT(obj, value, "C uint32_t"); + LONG_TO_UINT(uint32_t, obj, result); } -int PyLong_AsUInt64(PyObject *obj, uint64_t *value) +int PyLong_AsUInt64(PyObject *obj, uint64_t *result) { - LONG_TO_UINT(obj, value, "C uint64_t"); + LONG_TO_UINT(uint64_t, obj, result); }

1 0

gh-156723: Update bundled libexpat to version 2.8.4 (#156724)
by StanFromIreland Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/287b7cffb79d443614be51b48eaf085d66… commit: 287b7cffb79d443614be51b48eaf085d663aeecd branch: main author: Stan Ulbrych <stan(a)python.org> committer: StanFromIreland <stan(a)python.org> date: 2026-08-31T19:16:07+01:00 summary: gh-156723: Update bundled libexpat to version 2.8.4 (#156724) files: A Misc/NEWS.d/next/Security/2026-08-31-16-47-33.gh-issue-156723.KxCF5N.rst D Misc/NEWS.d/next/Security/2026-08-11-15-24-21.gh-issue-155558.yDsXZC.rst M Misc/sbom.spdx.json M Modules/expat/expat.h M Modules/expat/internal.h M Modules/expat/refresh.sh M Modules/expat/xmlparse.c M Modules/expat/xmltok.h diff --git a/Misc/NEWS.d/next/Security/2026-08-11-15-24-21.gh-issue-155558.yDsXZC.rst b/Misc/NEWS.d/next/Security/2026-08-31-16-47-33.gh-issue-156723.KxCF5N.rst similarity index 59% rename from Misc/NEWS.d/next/Security/2026-08-11-15-24-21.gh-issue-155558.yDsXZC.rst rename to Misc/NEWS.d/next/Security/2026-08-31-16-47-33.gh-issue-156723.KxCF5N.rst index 439366c8633e824..3dda6055f307d94 100644 --- a/Misc/NEWS.d/next/Security/2026-08-11-15-24-21.gh-issue-155558.yDsXZC.rst +++ b/Misc/NEWS.d/next/Security/2026-08-31-16-47-33.gh-issue-156723.KxCF5N.rst @@ -1,2 +1 @@ -Update bundled `libexpat <https://libexpat.github.io/>`_ to version 2.8.3 -for the fix to :cve:`2026-72522`. +Update bundled `libexpat <https://libexpat.github.io/>`_ to version 2.8.4. diff --git a/Misc/sbom.spdx.json b/Misc/sbom.spdx.json index 3e4feba10c85598..8708cef4e2ab26b 100644 --- a/Misc/sbom.spdx.json +++ b/Misc/sbom.spdx.json @@ -48,11 +48,11 @@ "checksums": [ { "algorithm": "SHA1", - "checksumValue": "7baecf6e04769cfb0c5ce2a6e3241e3a0bb8c9e9" + "checksumValue": "12dffaa4a67cbe308643dbec7ffc1b4fd38abbde" }, { "algorithm": "SHA256", - "checksumValue": "d3f19ed52dc975741ecc5a0fc553f910a241d60c76fa4621356d0cdb0490ca28" + "checksumValue": "0e912e25375e213b6e4ff90d554e0a0e037e6f0c20dfa734d366e5bdff289f20" } ], "fileName": "Modules/expat/expat.h" @@ -104,11 +104,11 @@ "checksums": [ { "algorithm": "SHA1", - "checksumValue": "476a11d9872f8f38844e398c5486ad183ffe2dcf" + "checksumValue": "4afd563c90edd6b4aa5abedcd3df5df023668d26" }, { "algorithm": "SHA256", - "checksumValue": "89f661fa3fa5f7892d83a13ecd685a56aace3fe740abce88a863031114ee2cef" + "checksumValue": "beb7211c800d827743bd3d6ddb86538302d6c51180be6d3b61a1c315e061762d" } ], "fileName": "Modules/expat/internal.h" @@ -216,11 +216,11 @@ "checksums": [ { "algorithm": "SHA1", - "checksumValue": "0939e3fe0ebb21a5b8ed9d9fdd33cde75ee5658a" + "checksumValue": "b9e4628f37353a7eec8a98c26ebb88d7e2d48971" }, { "algorithm": "SHA256", - "checksumValue": "da48375e85bdc2f97da4445169aafc0b363f150a1a8275dd417e6d84cfc3e443" + "checksumValue": "9afa5cb812283750f1970e230ba392201bac46240abf51ab65e5090e93ca34a6" } ], "fileName": "Modules/expat/xmlparse.c" @@ -272,11 +272,11 @@ "checksums": [ { "algorithm": "SHA1", - "checksumValue": "8e4bf167669dddff38269486f33eccb0fde0c7ca" + "checksumValue": "e9a5972f664c1c530443ddd8b7900e406e3ca02a" }, { "algorithm": "SHA256", - "checksumValue": "20013b75027e04e324452a002100076e30ec20e0f28b318f392317f99a4c4115" + "checksumValue": "41a6cef659ef1da9ee732304332c4134afe4b63571442de77eaf9918abf9e5df" } ], "fileName": "Modules/expat/xmltok.h" @@ -1044,14 +1044,14 @@ "checksums": [ { "algorithm": "SHA256", - "checksumValue": "22920a86c83f32300b11463635b71f11137a917975af297725e55525027d4e50" + "checksumValue": "b8ece2437692dad44d851c4532723390a5a330990007706be9c8d2b90d294f36" } ], - "downloadLocation": "https://github.com/libexpat/libexpat/releases/download/R_2_8_3/expat-2.8.3.…", + "downloadLocation": "https://github.com/libexpat/libexpat/releases/download/R_2_8_4/expat-2.8.4.…", "externalRefs": [ { "referenceCategory": "SECURITY", - "referenceLocator": "cpe:2.3:a:libexpat_project:libexpat:2.8.3:*:*:*:*:*:*:*", + "referenceLocator": "cpe:2.3:a:libexpat_project:libexpat:2.8.4:*:*:*:*:*:*:*", "referenceType": "cpe23Type" } ], @@ -1059,7 +1059,7 @@ "name": "expat", "originator": "Organization: Expat development team", "primaryPackagePurpose": "SOURCE", - "versionInfo": "2.8.3" + "versionInfo": "2.8.4" }, { "SPDXID": "SPDXRef-PACKAGE-hacl-star", diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h index dbebd985a652ac7..b296be9dbad2dc6 100644 --- a/Modules/expat/expat.h +++ b/Modules/expat/expat.h @@ -1096,7 +1096,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled); */ # define XML_MAJOR_VERSION 2 # define XML_MINOR_VERSION 8 -# define XML_MICRO_VERSION 3 +# define XML_MICRO_VERSION 4 # ifdef __cplusplus } diff --git a/Modules/expat/internal.h b/Modules/expat/internal.h index 7e67d2e378c5243..6311028e94b8f5f 100644 --- a/Modules/expat/internal.h +++ b/Modules/expat/internal.h @@ -33,6 +33,7 @@ Copyright (c) 2019 David Loffredo <loffredo(a)steptools.com> Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild(a)sony.com> Copyright (c) 2024 Taichi Haradaguchi <20001722(a)ymail.ne.jp> + Copyright (c) 2026 Matthew Wozniczka <mattheww(a)simba.com> Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/Modules/expat/refresh.sh b/Modules/expat/refresh.sh index 1499e92112fb952..ef06e87122aa260 100755 --- a/Modules/expat/refresh.sh +++ b/Modules/expat/refresh.sh @@ -12,9 +12,9 @@ fi # Update this when updating to a new version after verifying that the changes # the update brings in are good. These values are used for verifying the SBOM, too. -expected_libexpat_tag="R_2_8_3" -expected_libexpat_version="2.8.3" -expected_libexpat_sha256="22920a86c83f32300b11463635b71f11137a917975af297725e55525027d4e50" +expected_libexpat_tag="R_2_8_4" +expected_libexpat_version="2.8.4" +expected_libexpat_sha256="b8ece2437692dad44d851c4532723390a5a330990007706be9c8d2b90d294f36" expat_dir="$(realpath "$(dirname -- "${BASH_SOURCE[0]}")")" cd ${expat_dir} diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c index 4fa61bca8c16293..9a05da21d5a7fd3 100644 --- a/Modules/expat/xmlparse.c +++ b/Modules/expat/xmlparse.c @@ -1,4 +1,4 @@ -/* ee5f82c3ffd57c5224394ba46f348dbce466d34d6c925a527ae46b1cfe6adf1d (2.8.3+) +/* 13c4e8da8fccffb0e8e599684e0d447ad14c1bb0b48792cf5dd77d8712301871 (2.8.4+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| @@ -51,6 +51,9 @@ Copyright (c) 2026 Kartik Kenchi <netliomax25(a)gmail.com> Copyright (c) 2026 Haris Hussain <hextheshadow0x(a)gmail.com> Copyright (c) 2026 Evgeny Kotkov <kotkov(a)apache.org> + Copyright (c) 2026 Darren Carreras <carrerasdarren(a)gmail.com> + Copyright (c) 2026 Alberto Maschietto <albertomaschietto9(a)gmail.com> + Copyright (c) 2026 Zeyou Liu <zeyouliu(a)tencent.com> Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -330,7 +333,7 @@ typedef struct { const XML_Char *base; const XML_Char *publicId; const XML_Char *notation; - XML_Bool open; + bool open; XML_Bool hasMore; /* true if entity has not been completely processed */ /* An entity can be open while being already completely processed (hasMore == XML_FALSE). The reason is the delayed closing of entities until their inner @@ -381,6 +384,22 @@ typedef struct { const XML_Char *value; } DEFAULT_ATTRIBUTE; +// This structure allows mapping attribute names to instances of +// `DEFAULT_ATTRIBUTE`. +typedef struct { + // Member `name` goes first to make this structure compatible with structure + // `NAMED` (further up), which is needed to support use of structure + // `NAME_AND_DEFAULT_ATTRIBUTE` in a hash table as implemented by function + // `lookup` (further down). + const XML_Char *name; + // We would store a `DEFAULT_ATTRIBUTE *` here but the backing array + // can be reallocated which would invalidate the pointer. Using an index + // into the array instead, avoids that problem. + size_t attIndex; + // This is set to `false` by function `lookup`. + bool initialized; +} NAME_AND_DEFAULT_ATTRIBUTE; + typedef struct { unsigned long version; unsigned long hash; @@ -394,7 +413,7 @@ typedef struct { size_t nDefaultAtts; size_t allocDefaultAtts; DEFAULT_ATTRIBUTE *defaultAtts; - HASH_TABLE defaultAttsNames; + HASH_TABLE defaultAttForName; } ELEMENT_TYPE; typedef struct { @@ -579,6 +598,8 @@ static int dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd, XML_Parser parser); static int copyEntityTable(XML_Parser oldParser, HASH_TABLE *newTable, STRING_POOL *newPool, const HASH_TABLE *oldTable); +static NAMED *lookupWithLength(XML_Parser parser, HASH_TABLE *table, KEY name, + size_t nameLen, size_t createSize); static NAMED *lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize); static void FASTCALL hashTableInit(HASH_TABLE *table, XML_Parser parser); @@ -755,6 +776,8 @@ struct XML_ParserStruct { void *m_unknownEncodingMem; void *m_unknownEncodingData; void *m_unknownEncodingHandlerData; + // Application callback invoked by callUnknownEncodingConvert. + int(XMLCALL *m_unknownEncodingConvert)(void *, const char *); void(XMLCALL *m_unknownEncodingRelease)(void *); PROLOG_STATE m_prologState; Processor *m_processor; @@ -1177,6 +1200,25 @@ isCalledFromInsideHandler(XML_Parser parser) { return parser->m_handlerCallDepth > 0; } +static void +callUnknownEncodingRelease(XML_Parser parser) { + beforeHandler(parser); + parser->m_unknownEncodingRelease(parser->m_unknownEncodingData); + afterHandler(parser); + parser->m_unknownEncodingRelease = NULL; + parser->m_unknownEncodingData = NULL; +} + +static int XMLCALL +callUnknownEncodingConvert(void *data, const char *p) { + XML_Parser parser = data; + beforeHandler(parser); + const int result + = parser->m_unknownEncodingConvert(parser->m_unknownEncodingData, p); + afterHandler(parser); + return result; +} + static enum XML_Error callProcessor(XML_Parser parser, const char *start, const char *end, const char **endPtr) { @@ -1524,6 +1566,7 @@ parserInit(XML_Parser parser, const XML_Char *encodingName) { parser->m_inheritedBindings = NULL; parser->m_nSpecifiedAtts = 0; parser->m_unknownEncodingMem = NULL; + parser->m_unknownEncodingConvert = NULL; parser->m_unknownEncodingRelease = NULL; parser->m_unknownEncodingData = NULL; parser->m_parsingStatus.parsing = XML_INITIALIZED; @@ -1604,7 +1647,7 @@ XML_ParserReset(XML_Parser parser, const XML_Char *encodingName) { moveToFreeBindingList(parser, parser->m_inheritedBindings); FREE(parser, parser->m_unknownEncodingMem); if (parser->m_unknownEncodingRelease) - parser->m_unknownEncodingRelease(parser->m_unknownEncodingData); + callUnknownEncodingRelease(parser); poolClear(&parser->m_tempPool); poolClear(&parser->m_temp2Pool); FREE(parser, (void *)parser->m_protocolEncodingName); @@ -1915,7 +1958,7 @@ XML_ParserFree(XML_Parser parser) { FREE(parser, parser->m_nsAtts); FREE(parser, parser->m_unknownEncodingMem); if (parser->m_unknownEncodingRelease) - parser->m_unknownEncodingRelease(parser->m_unknownEncodingData); + callUnknownEncodingRelease(parser); FREE(parser, parser); } @@ -2739,7 +2782,7 @@ XML_GetCurrentLineNumber(XML_Parser parser) { parser->m_eventPtr, &parser->m_position); parser->m_positionPtr = parser->m_eventPtr; } - // NOTE: XML_Size is known to wrap around for >2 4iB content + // NOTE: XML_Size is known to wrap around for >4 GiB content // on 32bit machines and 64bit Windows, unless (non-default and // uncommon) XML_LARGE_SIZE is defined. // That's a bug and it only lives on because we cannot break @@ -2756,7 +2799,7 @@ XML_GetCurrentColumnNumber(XML_Parser parser) { parser->m_eventPtr, &parser->m_position); parser->m_positionPtr = parser->m_eventPtr; } - // NOTE: XML_Size is known to wrap around for >2 4iB content + // NOTE: XML_Size is known to wrap around for >4 GiB content // on 32bit machines and 64bit Windows, unless (non-default and // uncommon) XML_LARGE_SIZE is defined. // That's a bug and it only lives on because we cannot break @@ -3410,9 +3453,9 @@ doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc, return result; } else if (parser->m_externalEntityRefHandler) { const XML_Char *context; - entity->open = XML_TRUE; + entity->open = true; context = getContext(parser); - entity->open = XML_FALSE; + entity->open = false; if (! context) return XML_ERROR_NO_MEMORY; beforeHandler(parser); @@ -3837,8 +3880,8 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr, sizeof(ELEMENT_TYPE)); if (! elementType) return XML_ERROR_NO_MEMORY; - if (! elementType->defaultAttsNames.parser) - hashTableInit(&(elementType->defaultAttsNames), parser); + if (! elementType->defaultAttForName.parser) + hashTableInit(&(elementType->defaultAttForName), parser); if (parser->m_ns && ! setElementTypePrefix(parser, elementType)) return XML_ERROR_NO_MEMORY; } @@ -3951,11 +3994,14 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr, /* figure out whether declared as other than CDATA */ if (attId->maybeTokenized) { - for (size_t j = 0; j < nDefaultAtts; j++) { - if (attId == elementType->defaultAtts[j].id) { - isCdata = elementType->defaultAtts[j].isCdata; - break; - } + NAME_AND_DEFAULT_ATTRIBUTE *const nameAndDefaultAttribute + = (NAME_AND_DEFAULT_ATTRIBUTE *)lookup( + parser, &(elementType->defaultAttForName), attId->name, 0); + if (nameAndDefaultAttribute != NULL) { + assert(nameAndDefaultAttribute->attIndex < elementType->nDefaultAtts); + const DEFAULT_ATTRIBUTE *const att + = elementType->defaultAtts + nameAndDefaultAttribute->attIndex; + isCdata = att->isCdata; } } @@ -4046,8 +4092,8 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr, unsigned int nsAttsSize = 1u << parser->m_nsAttsPower; unsigned char oldNsAttsPower = parser->m_nsAttsPower; /* size of hash table must be at least 2 * (# of prefixed attributes) */ - if ((nPrefixes << 1) - >> parser->m_nsAttsPower) { /* true for m_nsAttsPower = 0 */ + if (parser->m_nsAttsPower == 0 + || (nPrefixes >> (parser->m_nsAttsPower - 1))) { /* hash table size must also be a power of 2 and >= 8 */ while (nPrefixes >> parser->m_nsAttsPower++) ; @@ -4946,25 +4992,34 @@ handleUnknownEncoding(XML_Parser parser, const XML_Char *encodingName) { const int status = parser->m_unknownEncodingHandler( parser->m_unknownEncodingHandlerData, encodingName, &info); afterHandler(parser); + + parser->m_unknownEncodingRelease = info.release; + parser->m_unknownEncodingData = info.data; + if (status) { ENCODING *enc; parser->m_unknownEncodingMem = MALLOC(parser, XmlSizeOfUnknownEncoding()); if (! parser->m_unknownEncodingMem) { - if (info.release) - info.release(info.data); + if (parser->m_unknownEncodingRelease) + callUnknownEncodingRelease(parser); + else + parser->m_unknownEncodingData = NULL; return XML_ERROR_NO_MEMORY; } + parser->m_unknownEncodingConvert = info.convert; enc = (parser->m_ns ? XmlInitUnknownEncodingNS : XmlInitUnknownEncoding)( - parser->m_unknownEncodingMem, info.map, info.convert, info.data); + parser->m_unknownEncodingMem, info.map, + info.convert ? callUnknownEncodingConvert : NULL, parser); if (enc) { - parser->m_unknownEncodingData = info.data; - parser->m_unknownEncodingRelease = info.release; parser->m_encoding = enc; return XML_ERROR_NONE; } + parser->m_unknownEncodingConvert = NULL; } - if (info.release != NULL) - info.release(info.data); + if (parser->m_unknownEncodingRelease != NULL) + callUnknownEncodingRelease(parser); + else + parser->m_unknownEncodingData = NULL; } return XML_ERROR_UNKNOWN_ENCODING; } @@ -6092,7 +6147,7 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, } if (parser->m_externalEntityRefHandler) { dtd->paramEntityRead = XML_FALSE; - entity->open = XML_TRUE; + entity->open = true; entityTrackingOnOpen(parser, entity, __LINE__); beforeHandler(parser); const int status = parser->m_externalEntityRefHandler( @@ -6101,11 +6156,11 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, afterHandler(parser); if (! status) { entityTrackingOnClose(parser, entity, __LINE__); - entity->open = XML_FALSE; + entity->open = false; return XML_ERROR_EXTERNAL_ENTITY_HANDLING; } entityTrackingOnClose(parser, entity, __LINE__); - entity->open = XML_FALSE; + entity->open = false; handleDefault = XML_FALSE; if (! dtd->paramEntityRead) { dtd->keepProcessing = dtd->standalone; @@ -6429,7 +6484,7 @@ processEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl, if (! openEntity) return XML_ERROR_NO_MEMORY; } - entity->open = XML_TRUE; + entity->open = true; entity->hasMore = XML_TRUE; #if XML_GE == 1 entityTrackingOnOpen(parser, entity, __LINE__); @@ -6520,7 +6575,7 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end, // to false. This means we can directly remove the head of // m_openInternalEntities assert(parser->m_openInternalEntities == openEntity); - entity->open = XML_FALSE; + entity->open = false; parser->m_openInternalEntities = parser->m_openInternalEntities->next; /* put openEntity back in list of free instances */ @@ -6598,7 +6653,7 @@ storeAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata, // with hasMore set to false. This means we can directly remove the head // of m_openAttributeEntities assert(parser->m_openAttributeEntities == openEntity); - entity->open = XML_FALSE; + entity->open = false; parser->m_openAttributeEntities = parser->m_openAttributeEntities->next; /* put openEntity back in list of free instances */ @@ -6894,7 +6949,7 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc, if (entity->systemId) { if (parser->m_externalEntityRefHandler) { dtd->paramEntityRead = XML_FALSE; - entity->open = XML_TRUE; + entity->open = true; entityTrackingOnOpen(parser, entity, __LINE__); beforeHandler(parser); const int status = parser->m_externalEntityRefHandler( @@ -6903,12 +6958,12 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc, afterHandler(parser); if (! status) { entityTrackingOnClose(parser, entity, __LINE__); - entity->open = XML_FALSE; + entity->open = false; result = XML_ERROR_EXTERNAL_ENTITY_HANDLING; goto endEntityValue; } entityTrackingOnClose(parser, entity, __LINE__); - entity->open = XML_FALSE; + entity->open = false; if (! dtd->paramEntityRead) dtd->keepProcessing = dtd->standalone; } else @@ -7058,7 +7113,7 @@ callStoreEntityValue(XML_Parser parser, const ENCODING *enc, // with hasMore set to false. This means we can directly remove the head // of m_openValueEntities assert(parser->m_openValueEntities == openEntity); - entity->open = XML_FALSE; + entity->open = false; parser->m_openValueEntities = parser->m_openValueEntities->next; /* put openEntity back in list of free instances */ @@ -7239,7 +7294,7 @@ defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *attId, XML_Bool isCdata, /* The handling of default attributes gets messed up if we have a default which duplicates a non-default. */ NAMED *const nameFound - = lookup(parser, &(type->defaultAttsNames), attId->name, 0); + = lookup(parser, &(type->defaultAttForName), attId->name, 0); if (nameFound) return 1; if (isId && ! type->idAtt && ! attId->xmlns) @@ -7275,11 +7330,24 @@ defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *attId, XML_Bool isCdata, if (! isCdata) attId->maybeTokenized = XML_TRUE; - NAMED *const nameAddedOrFound - = lookup(parser, &(type->defaultAttsNames), attId->name, sizeof(NAMED)); - if (! nameAddedOrFound) + NAME_AND_DEFAULT_ATTRIBUTE *const nameAndDefaultAttribute + = (NAME_AND_DEFAULT_ATTRIBUTE *)lookup( + parser, &(type->defaultAttForName), attId->name, + sizeof(NAME_AND_DEFAULT_ATTRIBUTE)); + if (! nameAndDefaultAttribute) return 0; + assert(nameAndDefaultAttribute->name == attId->name); + + // NOTE: The XML 1.0r4 spec says: + // "When more than one definition is provided for the same attribute of a + // given element type, the first declaration is binding and later + // declarations are ignored." + if (! nameAndDefaultAttribute->initialized) { + nameAndDefaultAttribute->attIndex = type->nDefaultAtts; + nameAndDefaultAttribute->initialized = true; + } + type->nDefaultAtts += 1; return 1; } @@ -7480,7 +7548,7 @@ setContext(XML_Parser parser, const XML_Char *context) { e = (ENTITY *)lookup(parser, &dtd->generalEntities, poolStart(&parser->m_tempPool), 0); if (e) - e->open = XML_TRUE; + e->open = true; if (*s != XML_T('\0')) s++; context = s; @@ -7597,7 +7665,7 @@ dtdReset(DTD *p, XML_Parser parser) { ELEMENT_TYPE *e = (ELEMENT_TYPE *)hashTableIterNext(&iter); if (! e) break; - hashTableDestroy(&(e->defaultAttsNames)); + hashTableDestroy(&(e->defaultAttForName)); FREE(parser, e->defaultAtts); } hashTableClear(&(p->generalEntities)); @@ -7639,7 +7707,7 @@ dtdDestroy(DTD *p, XML_Bool isDocEntity, XML_Parser parser) { ELEMENT_TYPE *e = (ELEMENT_TYPE *)hashTableIterNext(&iter); if (! e) break; - hashTableDestroy(&(e->defaultAttsNames)); + hashTableDestroy(&(e->defaultAttForName)); FREE(parser, e->defaultAtts); } hashTableDestroy(&(p->generalEntities)); @@ -7732,8 +7800,8 @@ dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd, if (! newE) return 0; - if (! newE->defaultAttsNames.parser) - hashTableInit(&(newE->defaultAttsNames), parser); + if (! newE->defaultAttForName.parser) + hashTableInit(&(newE->defaultAttForName), parser); if (oldE->nDefaultAtts) { /* Detect and prevent integer overflow. */ @@ -7766,11 +7834,22 @@ dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd, } else newE->defaultAtts[i].value = NULL; - NAMED *const nameAddedOrFound = lookup(parser, &(newE->defaultAttsNames), - attributeName, sizeof(NAMED)); - if (! nameAddedOrFound) { + NAME_AND_DEFAULT_ATTRIBUTE *const nameAndDefaultAttribute + = (NAME_AND_DEFAULT_ATTRIBUTE *)lookup( + parser, &(newE->defaultAttForName), attributeName, + sizeof(NAME_AND_DEFAULT_ATTRIBUTE)); + if (! nameAndDefaultAttribute) { return 0; } + + // NOTE: The XML 1.0r4 spec says: + // "When more than one definition is provided for the same attribute of a + // given element type, the first declaration is binding and later + // declarations are ignored." + if (! nameAndDefaultAttribute->initialized) { + nameAndDefaultAttribute->attIndex = i; + nameAndDefaultAttribute->initialized = true; + } } } @@ -7867,19 +7946,23 @@ copyEntityTable(XML_Parser oldParser, HASH_TABLE *newTable, #define INIT_POWER 6 +// Compares two strings `s1` and `s2` whereas: +// - `s2` is zero-terminated but +// - `s1` is made up of exactly (not just up to) `s1len` non-zero characters. static XML_Bool FASTCALL -keyeq(KEY s1, KEY s2) { +keyeq(KEY s1, size_t s1len, KEY s2) { #ifdef XML_UNICODE # ifdef XML_UNICODE_WCHAR_T - return (wcscmp(s1, s2) == 0) ? XML_TRUE : XML_FALSE; + return (wcsncmp(s1, s2, s1len) == 0 && s2[s1len] == L'\0') ? XML_TRUE + : XML_FALSE; # else - for (; *s1 == *s2; s1++, s2++) - if (*s1 == 0) - return XML_TRUE; - return XML_FALSE; + for (; s1len > 0 && *s1 == *s2; s1len--, s1++, s2++) + ; /* no loop body! */ + return ((s1len == 0) && (*s2 == 0)) ? XML_TRUE : XML_FALSE; # endif #else - return (strcmp(s1, s2) == 0) ? XML_TRUE : XML_FALSE; + return (strncmp(s1, s2, s1len) == 0 && s2[s1len] == '\0') ? XML_TRUE + : XML_FALSE; #endif } @@ -7897,18 +7980,38 @@ copy_salt_to_sipkey(XML_Parser parser, struct sipkey *key) { } static unsigned long FASTCALL -hash(XML_Parser parser, KEY s) { +hash(XML_Parser parser, KEY s, size_t keyLen) { struct siphash state; struct sipkey key; (void)sip24_valid; copy_salt_to_sipkey(parser, &key); sip24_init(&state, &key); - sip24_update(&state, s, keylen(s) * sizeof(XML_Char)); + sip24_update(&state, s, keyLen * sizeof(XML_Char)); return (unsigned long)sip24_final(&state); } +// Function `lookupWithLength` can be used to either… +// +// a) check whether an element with key `name` exists in the given hash table +// (read-only mode where `createSize == 0`) or +// +// b) check whether an element with key `name` exists in the given hash table +// *and* insert it if missing (i.e. read-write mode where `createSize != 0`. +// +// When inserting, a block of `createSize` number of bytes will be allocated +// and set to zero, and the resulting block of memory will be considered +// to start with a `NAMED` structure, and `->name = name;` is performed. +// The fact that all other bytes in the structure are initially zero can +// be used to tell cases "existed and found" and "newly inserted" apart +// with the structure returned. +// +// NOTE: Read-only lookup does not need zero-terminated keys but +// read-write mode does, because keys can be re-hashed later and the +// hash table does not store key length information. +// static NAMED * -lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize) { +lookupWithLength(XML_Parser parser, HASH_TABLE *table, KEY name, size_t nameLen, + size_t createSize) { size_t i; if (table->size == 0) { size_t tsize; @@ -7924,14 +8027,14 @@ lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize) { return NULL; } memset(table->v, 0, tsize); - i = hash(parser, name) & ((unsigned long)table->size - 1); + i = hash(parser, name, nameLen) & ((unsigned long)table->size - 1); } else { - unsigned long h = hash(parser, name); + unsigned long h = hash(parser, name, nameLen); unsigned long mask = (unsigned long)table->size - 1; unsigned char step = 0; i = h & mask; while (table->v[i]) { - if (keyeq(name, table->v[i]->name)) + if (keyeq(name, nameLen, table->v[i]->name)) return table->v[i]; if (! step) step = PROBE_STEP(h, mask, table->power); @@ -7964,7 +8067,8 @@ lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize) { memset(newV, 0, tsize); for (i = 0; i < table->size; i++) if (table->v[i]) { - unsigned long newHash = hash(parser, table->v[i]->name); + KEY const key = table->v[i]->name; + unsigned long newHash = hash(parser, key, keylen(key)); size_t j = newHash & newMask; step = 0; while (newV[j]) { @@ -7987,15 +8091,36 @@ lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize) { } } } + assert(createSize >= sizeof(NAMED)); table->v[i] = MALLOC(table->parser, createSize); if (! table->v[i]) return NULL; memset(table->v[i], 0, createSize); - table->v[i]->name = name; + table->v[i]->name = name; // NOTE: This requires and assumes zero termination! (table->used)++; return table->v[i]; } +// Function `lookup` can be used to either… +// +// a) check whether an element with key `name` exists in the given hash table +// (read-only mode where `createSize == 0`) or +// +// b) check whether an element with key `name` exists in the given hash table +// *and* insert it if missing (i.e. read-write mode where `createSize != 0`. +// +// When inserting, a block of `createSize` number of bytes will be allocated +// and set to zero, and the resulting block of memory will be considered +// to start with a `NAMED` structure, and `->name = name;` is performed. +// The fact that all other bytes in the structure are initially zero can +// be used to tell cases "existed and found" and "newly inserted" apart +// with the structure returned. +// +static NAMED * +lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize) { + return lookupWithLength(parser, table, name, keylen(name), createSize); +} + static void FASTCALL hashTableClear(HASH_TABLE *table) { size_t i; @@ -8535,8 +8660,8 @@ getElementType(XML_Parser parser, const ENCODING *enc, const char *ptr, sizeof(ELEMENT_TYPE)); if (! ret) return NULL; - if (! ret->defaultAttsNames.parser) - hashTableInit(&(ret->defaultAttsNames), getRootParserOf(parser, NULL)); + if (! ret->defaultAttForName.parser) + hashTableInit(&(ret->defaultAttForName), getRootParserOf(parser, NULL)); if (ret->name != name) poolDiscard(&dtd->pool); else { diff --git a/Modules/expat/xmltok.h b/Modules/expat/xmltok.h index bd868b87a407d67..76be2c7c5ca1bab 100644 --- a/Modules/expat/xmltok.h +++ b/Modules/expat/xmltok.h @@ -169,8 +169,8 @@ typedef int(PTRCALL *SCANNER)(const ENCODING *, const char *, const char *, enum XML_Convert_Result { XML_CONVERT_COMPLETED = 0, XML_CONVERT_INPUT_INCOMPLETE = 1, - XML_CONVERT_OUTPUT_EXHAUSTED - = 2 /* and therefore potentially input remaining as well */ + XML_CONVERT_OUTPUT_EXHAUSTED = 2 /* and therefore potentially input remaining + as well */ }; struct encoding {

1 0

gh-155358: Use named attributes with urllib.parse module (#155364)
by vstinner Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/1855c6c40b02a5c8e75de2832dbb6cbd24… commit: 1855c6c40b02a5c8e75de2832dbb6cbd24351f1b branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2026-08-31T18:03:33Z summary: gh-155358: Use named attributes with urllib.parse module (#155364) urlparse(), replace: * parts[0] => parts.scheme * parts[1] => parts.netloc * parts[2] => parts.path urlsplit(), replace: * parts[0] => parts.scheme * parts[1] => parts.netloc * parts[2] => parts.path files: M Lib/http/cookiejar.py M Lib/test/ssl_servers.py M Lib/test/support/__init__.py M Lib/urllib/request.py M Lib/urllib/robotparser.py diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py index 144db91a0f03173..5c5dc78b064885d 100644 --- a/Lib/http/cookiejar.py +++ b/Lib/http/cookiejar.py @@ -627,7 +627,7 @@ def request_host(request): """ url = request.get_full_url() - host = urllib.parse.urlparse(url)[1] + host = urllib.parse.urlparse(url).netloc if host == "": host = request.get_header("Host", "") diff --git a/Lib/test/ssl_servers.py b/Lib/test/ssl_servers.py index 15b071e04dda1f3..e3416a822f65253 100644 --- a/Lib/test/ssl_servers.py +++ b/Lib/test/ssl_servers.py @@ -61,7 +61,7 @@ def translate_path(self, path): """ # abandon query parameters - path = urllib.parse.urlparse(path)[2] + path = urllib.parse.urlparse(path).path path = os.path.normpath(urllib.parse.unquote(path)) words = path.split('/') words = filter(None, words) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index be71575a6ea06a9..1c28af08988d9f0 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -868,7 +868,7 @@ def open_urlresource(url, *args, **kw): check = kw.pop('check', None) - filename = urllib.parse.urlparse(url)[2].split('/')[-1] # '/': it's URL! + filename = urllib.parse.urlparse(url).path.split('/')[-1] # '/': it's URL! fn = os.path.join(TEST_DATA_DIR, filename) diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 9fa92659a255ed4..59ed4a7140d59c6 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -274,7 +274,7 @@ def request_host(request): """ url = request.full_url - host = urlparse(url)[1] + host = urlparse(url).netloc if host == "": host = request.get_header("Host", "") @@ -833,11 +833,11 @@ def reduce_uri(self, uri, default_port=True): """Accept authority or URI and extract only the authority and path.""" # note HTTP URLs do not have a userinfo component parts = urlsplit(uri) - if parts[1]: + if parts.netloc: # URI - scheme = parts[0] - authority = parts[1] - path = parts[2] or '/' + scheme = parts.scheme + authority = parts.netloc + path = parts.path or '/' else: # host or host:port scheme = None @@ -1222,7 +1222,7 @@ class HTTPDigestAuthHandler(BaseHandler, AbstractDigestAuthHandler): handler_order = 490 # before Basic auth def http_error_401(self, req, fp, code, msg, headers): - host = urlparse(req.full_url)[1] + host = urlparse(req.full_url).netloc retry = self.http_error_auth_reqed('www-authenticate', host, req, headers) self.reset_retry_count() diff --git a/Lib/urllib/robotparser.py b/Lib/urllib/robotparser.py index 8d0311d96f5e0b4..985333c71004389 100644 --- a/Lib/urllib/robotparser.py +++ b/Lib/urllib/robotparser.py @@ -62,7 +62,9 @@ def set_url(self, url): if isinstance(url, urllib.request.Request): url = url.full_url - self.host, self.path = urllib.parse.urlsplit(url)[1:3] + parts = urllib.parse.urlsplit(url) + self.host = parts.netloc + self.path = parts.path def read(self): """Reads the robots.txt URL and feeds it to the parser."""

1 0

gh-156101: Don't set the result in error in PyLong_AsInt32() (#156727)
by vstinner Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/63f662663acd3751632e75fb03e7f1e52c… commit: 63f662663acd3751632e75fb03e7f1e52c4bb5e5 branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2026-08-31T17:48:23Z summary: gh-156101: Don't set the result in error in PyLong_AsInt32() (#156727) Don't set the result in error in PyLong_AsInt32(), PyLong_AsUInt32(), PyLong_AsInt64() and PyLong_AsUInt64(). Leave the result unchanged in this case. files: A Misc/NEWS.d/next/C_API/2026-08-31-19-14-15.gh-issue-156101.d4PSIF.rst M Modules/_testlimitedcapi/long.c M Objects/longobject.c diff --git a/Misc/NEWS.d/next/C_API/2026-08-31-19-14-15.gh-issue-156101.d4PSIF.rst b/Misc/NEWS.d/next/C_API/2026-08-31-19-14-15.gh-issue-156101.d4PSIF.rst new file mode 100644 index 000000000000000..68822d6702e3bc2 --- /dev/null +++ b/Misc/NEWS.d/next/C_API/2026-08-31-19-14-15.gh-issue-156101.d4PSIF.rst @@ -0,0 +1,4 @@ +Don't set the result in error in :c:func:`PyLong_AsInt32`, +:c:func:`PyLong_AsUInt32`, :c:func:`PyLong_AsInt64` and +:c:func:`PyLong_AsUInt64`. Leave the result unchanged in this case. Patch by +Victor Stinner. diff --git a/Modules/_testlimitedcapi/long.c b/Modules/_testlimitedcapi/long.c index 7c6928dd234e323..1654f9210e1d0ba 100644 --- a/Modules/_testlimitedcapi/long.c +++ b/Modules/_testlimitedcapi/long.c @@ -764,8 +764,9 @@ static PyObject * pylong_asint32(PyObject *module, PyObject *arg) { NULLABLE(arg); - int32_t value; + int32_t value = UNINITIALIZED_INT; if (PyLong_AsInt32(arg, &value) < 0) { + assert(value == UNINITIALIZED_INT); return NULL; } return PyLong_FromInt32(value); @@ -775,8 +776,9 @@ static PyObject * pylong_asuint32(PyObject *module, PyObject *arg) { NULLABLE(arg); - uint32_t value; + uint32_t value = UNINITIALIZED_INT; if (PyLong_AsUInt32(arg, &value) < 0) { + assert(value == UNINITIALIZED_INT); return NULL; } return PyLong_FromUInt32(value); @@ -787,8 +789,9 @@ static PyObject * pylong_asint64(PyObject *module, PyObject *arg) { NULLABLE(arg); - int64_t value; + int64_t value = UNINITIALIZED_INT; if (PyLong_AsInt64(arg, &value) < 0) { + assert(value == UNINITIALIZED_INT); return NULL; } return PyLong_FromInt64(value); @@ -798,8 +801,9 @@ static PyObject * pylong_asuint64(PyObject *module, PyObject *arg) { NULLABLE(arg); - uint64_t value; + uint64_t value = UNINITIALIZED_INT; if (PyLong_AsUInt64(arg, &value) < 0) { + assert(value == UNINITIALIZED_INT); return NULL; } return PyLong_FromUInt64(value); diff --git a/Objects/longobject.c b/Objects/longobject.c index 7a38ae8ea5a36f0..6454565aebf6a11 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -6800,58 +6800,62 @@ PyObject* PyLong_FromUInt64(uint64_t value) PYLONG_FROM_UINT(uint64_t, value); } -#define LONG_TO_INT(obj, value, type_name) \ +#define LONG_TO_INT(type, obj, result) \ do { \ + type value; \ int flags = (Py_ASNATIVEBYTES_NATIVE_ENDIAN \ | Py_ASNATIVEBYTES_ALLOW_INDEX); \ - Py_ssize_t bytes = PyLong_AsNativeBytes(obj, value, sizeof(*value), flags); \ + Py_ssize_t bytes = PyLong_AsNativeBytes(obj, &value, sizeof(value), flags); \ if (bytes < 0) { \ return -1; \ } \ - if ((size_t)bytes > sizeof(*value)) { \ + if ((size_t)bytes > sizeof(value)) { \ PyErr_SetString(PyExc_OverflowError, \ - "Python int too large to convert to " type_name); \ + "Python int too large to convert to C " #type); \ return -1; \ } \ + *result = value; \ return 0; \ } while (0) -int PyLong_AsInt32(PyObject *obj, int32_t *value) +int PyLong_AsInt32(PyObject *obj, int32_t *result) { - LONG_TO_INT(obj, value, "C int32_t"); + LONG_TO_INT(int32_t, obj, result); } -int PyLong_AsInt64(PyObject *obj, int64_t *value) +int PyLong_AsInt64(PyObject *obj, int64_t *result) { - LONG_TO_INT(obj, value, "C int64_t"); + LONG_TO_INT(int64_t, obj, result); } -#define LONG_TO_UINT(obj, value, type_name) \ +#define LONG_TO_UINT(type, obj, result) \ do { \ + type value; \ int flags = (Py_ASNATIVEBYTES_NATIVE_ENDIAN \ | Py_ASNATIVEBYTES_UNSIGNED_BUFFER \ | Py_ASNATIVEBYTES_REJECT_NEGATIVE \ | Py_ASNATIVEBYTES_ALLOW_INDEX); \ - Py_ssize_t bytes = PyLong_AsNativeBytes(obj, value, sizeof(*value), flags); \ + Py_ssize_t bytes = PyLong_AsNativeBytes(obj, &value, sizeof(value), flags); \ if (bytes < 0) { \ return -1; \ } \ - if ((size_t)bytes > sizeof(*value)) { \ + if ((size_t)bytes > sizeof(value)) { \ PyErr_SetString(PyExc_OverflowError, \ - "Python int too large to convert to " type_name); \ + "Python int too large to convert to C " #type); \ return -1; \ } \ + *result = value; \ return 0; \ } while (0) -int PyLong_AsUInt32(PyObject *obj, uint32_t *value) +int PyLong_AsUInt32(PyObject *obj, uint32_t *result) { - LONG_TO_UINT(obj, value, "C uint32_t"); + LONG_TO_UINT(uint32_t, obj, result); } -int PyLong_AsUInt64(PyObject *obj, uint64_t *value) +int PyLong_AsUInt64(PyObject *obj, uint64_t *result) { - LONG_TO_UINT(obj, value, "C uint64_t"); + LONG_TO_UINT(uint64_t, obj, result); }

1 0

gh-155742: Get singleton in PyBytesWriter_FinishWithSize() (#155795)
by vstinner Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/5ef7fa169fecf37031e4fe31b9c52ab048… commit: 5ef7fa169fecf37031e4fe31b9c52ab048c9c2e5 branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2026-08-31T19:20:11+02:00 summary: gh-155742: Get singleton in PyBytesWriter_FinishWithSize() (#155795) If the result size of 1 byte, return the singleton rather than creating a new bytes string. files: A Misc/NEWS.d/next/C_API/2026-08-14-14-47-08.gh-issue-155742.UGI3Pn.rst M Lib/test/test_capi/test_bytes.py M Modules/_testcapi/bytes.c M Objects/bytesobject.c diff --git a/Lib/test/test_capi/test_bytes.py b/Lib/test/test_capi/test_bytes.py index d20e5016f969c2f..38cda931e7d54f3 100644 --- a/Lib/test/test_capi/test_bytes.py +++ b/Lib/test/test_capi/test_bytes.py @@ -299,11 +299,11 @@ def test_join(self): bytes_join(b'', NULL) -class BytesWriterTest(unittest.TestCase): - result_type = bytes +class BaseWriterTest: + result_type = NotImplementedError def create_writer(self, alloc=0, string=b''): - return _testcapi.PyBytesWriter(alloc, string, 0) + raise NotImplementedError def test_create(self): # Test PyBytesWriter_Create() @@ -388,10 +388,48 @@ def test_example_highlevel(self): self.assertEqual(_testcapi.byteswriter_highlevel(), b'Hello World!') -class ByteArrayWriterTest(BytesWriterTest): +class BytesWriterTest(BaseWriterTest, unittest.TestCase): + result_type = bytes + + def create_writer(self, alloc=0, string=b''): + # Test PyBytesWriter_Create() + return _testcapi.PyBytesWriter(alloc, string, 0) + + # Only PyBytesWriter_Create() returns singletons + def test_singletons(self): + empty = b'' + singletons = {ch: bytes((ch,)) for ch in range(256)} + small_buffer = _testcapi.PyBytesWriter_small_buffer + + writer = self.create_writer() + self.assertIs(writer.finish(), empty) + + # Test writer larger than small_buffer + writer = self.create_writer() + unused_text = b'x' * (small_buffer * 2) + writer.write_bytes(unused_text, len(unused_text)) + self.assertIs(writer.finish_with_size(0), empty) + + for ch in range(256): + text = bytes((ch,)) + + writer = self.create_writer() + writer.write_bytes(text, 1) + self.assertIs(writer.finish(), singletons[ch]) + + # Test writer larger than small_buffer + writer = self.create_writer() + writer.write_bytes(text, 1) + unused_text = b'x' * (small_buffer * 2) + writer.write_bytes(unused_text, len(unused_text)) + self.assertIs(writer.finish_with_size(1), singletons[ch]) + + +class ByteArrayWriterTest(BaseWriterTest, unittest.TestCase): result_type = bytearray def create_writer(self, alloc=0, string=b''): + # Test private _PyBytesWriter_CreateByteArray() return _testcapi.PyBytesWriter(alloc, string, 1) diff --git a/Misc/NEWS.d/next/C_API/2026-08-14-14-47-08.gh-issue-155742.UGI3Pn.rst b/Misc/NEWS.d/next/C_API/2026-08-14-14-47-08.gh-issue-155742.UGI3Pn.rst new file mode 100644 index 000000000000000..8920547968a4fbd --- /dev/null +++ b/Misc/NEWS.d/next/C_API/2026-08-14-14-47-08.gh-issue-155742.UGI3Pn.rst @@ -0,0 +1,2 @@ +:c:func:`PyBytesWriter_FinishWithSize` now returns single byte singletons if +*size* equals to ``1``. Patch by Victor Stinner. diff --git a/Modules/_testcapi/bytes.c b/Modules/_testcapi/bytes.c index f12fc7f5f3a2a86..a868c684cc987cd 100644 --- a/Modules/_testcapi/bytes.c +++ b/Modules/_testcapi/bytes.c @@ -4,6 +4,8 @@ #include "parts.h" #include "util.h" +#include <stddef.h> // offsetof() + #include "pycore_bytesobject.h" // _PyBytesWriter_CreateByteArray() @@ -150,8 +152,8 @@ writer_write_bytes(PyObject *self_raw, PyObject *args) } char *bytes; - Py_ssize_t size; - if (!PyArg_ParseTuple(args, "yn", &bytes, &size)) { + Py_ssize_t unused_size, size; + if (!PyArg_ParseTuple(args, "y#n", &bytes, &unused_size, &size)) { return NULL; } @@ -377,5 +379,12 @@ _PyTestCapi_Init_Bytes(PyObject *m) } Py_DECREF(writer_type); + // PyBytesWriter.obj is the second member, small_buffer is the first member + long size = (long)offsetof(PyBytesWriter, obj); + if (PyModule_AddIntConstant(m, "PyBytesWriter_small_buffer", size) < 0) { + Py_DECREF(writer_type); + return -1; + } + return 0; } diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index ef35dad82e8aaea..4c3da93f1019709 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -3766,13 +3766,23 @@ PyBytesWriter_FinishWithSize(PyBytesWriter *writer, Py_ssize_t size) } } } + result = writer->obj; writer->obj = NULL; + + if (size == 1 && !writer->use_bytearray) { + // Get the single byte singleton + unsigned char ch = PyBytes_AS_STRING(result)[0]; + PyObject *op = (PyObject*)CHARACTER(ch); + assert(_Py_IsImmortal(op)); + Py_SETREF(result, op); + } } else if (writer->use_bytearray) { result = PyByteArray_FromStringAndSize(writer->small_buffer, size); } else { + // The function returns single byte singleton if size equals 1 result = PyBytes_FromStringAndSize(writer->small_buffer, size); } PyBytesWriter_Discard(writer);

1 0

[3.14] gh-156707: Do not follow junctions in os_helper.rmtree() on Windows (GH-156710) (GH-156715)
by serhiy-storchaka Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/60138de699a6fc8e180267bce3fa618820… commit: 60138de699a6fc8e180267bce3fa6188208283c6 branch: 3.14 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2026-08-31T14:37:55Z summary: [3.14] gh-156707: Do not follow junctions in os_helper.rmtree() on Windows (GH-156710) (GH-156715) os.lstat() reports a junction as a directory, so the junction was followed and files in the directory it points to could be removed. Now the junction itself is removed, as in os.walk() and shutil.rmtree(). (cherry picked from commit d87ee279a1f6dfdb478ede5f0ba0360123d85916) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Lib/test/support/os_helper.py diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py index daf6060940e97f0..36d2fa94c61d4f4 100644 --- a/Lib/test/support/os_helper.py +++ b/Lib/test/support/os_helper.py @@ -433,7 +433,10 @@ def _rmtree_inner(path): file=sys.__stderr__) mode = 0 if stat.S_ISDIR(mode): - _waitfor(_rmtree_inner, fullname, waitall=True) + # Do not follow junctions, which os.lstat() reports + # as directories. + if not os.path.isjunction(fullname): + _waitfor(_rmtree_inner, fullname, waitall=True) _force_run(fullname, os.rmdir, fullname) else: _force_run(fullname, os.unlink, fullname)

1 0

[3.13] gh-156707: Do not follow junctions in os_helper.rmtree() on Windows (GH-156710) (GH-156716)
by serhiy-storchaka Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/d4f5fdf123295427ef0cdf19548376c3b2… commit: d4f5fdf123295427ef0cdf19548376c3b2ff65f5 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2026-08-31T14:36:36Z summary: [3.13] gh-156707: Do not follow junctions in os_helper.rmtree() on Windows (GH-156710) (GH-156716) os.lstat() reports a junction as a directory, so the junction was followed and files in the directory it points to could be removed. Now the junction itself is removed, as in os.walk() and shutil.rmtree(). (cherry picked from commit d87ee279a1f6dfdb478ede5f0ba0360123d85916) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Lib/test/support/os_helper.py diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py index 3bd177ba7d497dd..42898f2b4ea571a 100644 --- a/Lib/test/support/os_helper.py +++ b/Lib/test/support/os_helper.py @@ -406,7 +406,10 @@ def _rmtree_inner(path): file=sys.__stderr__) mode = 0 if stat.S_ISDIR(mode): - _waitfor(_rmtree_inner, fullname, waitall=True) + # Do not follow junctions, which os.lstat() reports + # as directories. + if not os.path.isjunction(fullname): + _waitfor(_rmtree_inner, fullname, waitall=True) _force_run(fullname, os.rmdir, fullname) else: _force_run(fullname, os.unlink, fullname)

1 0

gh-156707: Do not follow junctions in os_helper.rmtree() on Windows (GH-156710)
by serhiy-storchaka Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/d87ee279a1f6dfdb478ede5f0ba0360123… commit: d87ee279a1f6dfdb478ede5f0ba0360123d85916 branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2026-08-31T14:11:29Z summary: gh-156707: Do not follow junctions in os_helper.rmtree() on Windows (GH-156710) os.lstat() reports a junction as a directory, so the junction was followed and files in the directory it points to could be removed. Now the junction itself is removed, as in os.walk() and shutil.rmtree(). files: M Lib/test/support/os_helper.py diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py index e1e2e69cb3d8334..12d34dedfe1bbaa 100644 --- a/Lib/test/support/os_helper.py +++ b/Lib/test/support/os_helper.py @@ -434,7 +434,10 @@ def _rmtree_inner(path): file=sys.__stderr__) mode = 0 if stat.S_ISDIR(mode): - _waitfor(_rmtree_inner, fullname, waitall=True) + # Do not follow junctions, which os.lstat() reports + # as directories. + if not os.path.isjunction(fullname): + _waitfor(_rmtree_inner, fullname, waitall=True) _force_run(fullname, os.rmdir, fullname) else: _force_run(fullname, os.unlink, fullname)

1 0

[3.14] gh-156523: Fix asyncio.as_completed() not recording the awaiting task (GH-156527) (#156553)
by kumaraditya303 Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/ec7c6a0c726920915e776598976f9c9fa2… commit: ec7c6a0c726920915e776598976f9c9fa24743c4 branch: 3.14 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: kumaraditya303 <kumaraditya(a)python.org> date: 2026-08-31T19:27:17+05:30 summary: [3.14] gh-156523: Fix asyncio.as_completed() not recording the awaiting task (GH-156527) (#156553) gh-156523: Fix asyncio.as_completed() not recording the awaiting task (GH-156527) (cherry picked from commit b0c9fc37dd0ed60456313600e6a01478308f195e) Co-authored-by: Timofei Ivankov <128279579+deadlovelll(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2026-08-28-18-10-25.gh-issue-156523.llJqo9.rst M Lib/asyncio/tasks.py M Lib/test/test_asyncio/test_graph.py diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 0417830467fb212..e989498d6e8632b 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -562,9 +562,11 @@ def __init__(self, aws, timeout): self._timeout_handle = None loop = events.get_event_loop() + self._cur_task = current_task() todo = {ensure_future(aw, loop=loop) for aw in set(aws)} for f in todo: f.add_done_callback(self._handle_completion) + futures.future_add_to_awaited_by(f, self._cur_task) if todo and timeout is not None: self._timeout_handle = ( loop.call_later(timeout, self._handle_timeout) @@ -595,6 +597,7 @@ def __next__(self): def _handle_timeout(self): for f in self._todo: f.remove_done_callback(self._handle_completion) + futures.future_discard_from_awaited_by(f, self._cur_task) self._done.put_nowait(None) # Sentinel for _wait_for_one(). self._todo.clear() # Can't do todo.remove(f) in the loop. @@ -602,6 +605,7 @@ def _handle_completion(self, f): if not self._todo: return # _handle_timeout() was here first. self._todo.remove(f) + futures.future_discard_from_awaited_by(f, self._cur_task) self._done.put_nowait(f) if not self._todo and self._timeout_handle is not None: self._timeout_handle.cancel() diff --git a/Lib/test/test_asyncio/test_graph.py b/Lib/test/test_asyncio/test_graph.py index 46a7c3d3192837d..690f8f58b8f10da 100644 --- a/Lib/test/test_asyncio/test_graph.py +++ b/Lib/test/test_asyncio/test_graph.py @@ -271,6 +271,68 @@ async def main(t1, t2): ] ]) + async def test_stack_as_completed(self): + # gh-156523: as_completed() must record the awaiting task + stack_for_inner = None + + async def inner(): + await asyncio.sleep(0) + nonlocal stack_for_inner + stack_for_inner = capture_test_stack() + + async def main(t): + for f in asyncio.as_completed([t]): + await f + + t = asyncio.create_task(inner(), name='inner') + await main(t) + self.assertFalse(t._asyncio_awaited_by) + + self.assertEqual(stack_for_inner[0], [ + 'T<inner>', + ['s capture_test_stack', 'a inner'], + [ + ['T<anon>', + ['a get', 'a _wait_for_one', 'a main', + 'a test_stack_as_completed'], + [] + ] + ] + ]) + + async def test_stack_as_completed_timeout(self): + # gh-156523: the awaiting task must be dropped when as_completed() times out + stack_for_inner = None + + async def inner(): + nonlocal stack_for_inner + stack_for_inner = capture_test_stack() + await asyncio.sleep(3600) + + async def main(t): + with self.assertRaises(TimeoutError): + for f in asyncio.as_completed([t], timeout=0.01): + await f + + t = asyncio.create_task(inner(), name='inner') + await main(t) + self.assertFalse(t._asyncio_awaited_by) + t.cancel() + with self.assertRaises(asyncio.CancelledError): + await t + + self.assertEqual(stack_for_inner[0], [ + 'T<inner>', + ['s capture_test_stack', 'a inner'], + [ + ['T<anon>', + ['a get', 'a _wait_for_one', 'a main', + 'a test_stack_as_completed_timeout'], + [] + ] + ] + ]) + async def test_stack_task(self): stack_for_inner = None diff --git a/Misc/NEWS.d/next/Library/2026-08-28-18-10-25.gh-issue-156523.llJqo9.rst b/Misc/NEWS.d/next/Library/2026-08-28-18-10-25.gh-issue-156523.llJqo9.rst new file mode 100644 index 000000000000000..c1c95d76c0d23bb --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-08-28-18-10-25.gh-issue-156523.llJqo9.rst @@ -0,0 +1,2 @@ +Fix :func:`asyncio.as_completed` not recording the awaiting task in the call +graph.

1 0