Mailman 3 August 2026 - Python-checkins

[3.14] gh-156689: Fix out-of-bounds read in `PyAst_CheckMode()` for `mode='func_type'` (GH-156697) (#156704)
by StanFromIreland Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/1546d44f6ee2a629a27748c8aae97f98b0… commit: 1546d44f6ee2a629a27748c8aae97f98b0e4ae93 branch: 3.14 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: StanFromIreland <stan(a)python.org> date: 2026-08-31T14:19:57+01:00 summary: [3.14] gh-156689: Fix out-of-bounds read in `PyAst_CheckMode()` for `mode='func_type'` (GH-156697) (#156704) (cherry picked from commit d7f9c6400f49633221983d0c454cf27ecb0302ba) Co-authored-by: Stan Ulbrych <stan(a)python.org> files: A Misc/NEWS.d/next/Core_and_Builtins/2026-08-31-10-45-11.gh-issue-156689.Jq3xNv.rst M Doc/library/ast.rst M Lib/test/test_ast/test_ast.py M Parser/asdl_c.py M Python/Python-ast.c diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst index 5338d407ca22596..85fc2b9b0232a88 100644 --- a/Doc/library/ast.rst +++ b/Doc/library/ast.rst @@ -2257,7 +2257,7 @@ and classes for traversing abstract syntax trees: In addition, if ``mode`` is ``'func_type'``, the input syntax is modified to correspond to :pep:`484` "signature type comments", - e.g. ``(str, int) -> List[str]``. + for example ``(str, int) -> List[str]``. Setting ``feature_version`` to a tuple ``(major, minor)`` will result in a "best-effort" attempt to parse using that Python version's grammar. diff --git a/Lib/test/test_ast/test_ast.py b/Lib/test/test_ast/test_ast.py index 5d5967cd9148e65..94ad8f85b17a24c 100644 --- a/Lib/test/test_ast/test_ast.py +++ b/Lib/test/test_ast/test_ast.py @@ -152,6 +152,15 @@ def test_parse_invalid_ast(self): self.assertRaises(TypeError, ast.parse, ast.Constant(42), optimize=optval) + def test_parse_ast_func_type(self): + # see gh-156689 + tree = ast.parse('(int, str) -> bool', mode='func_type') + self.assertEqual(ast.dump(ast.parse(tree, mode='func_type')), + ast.dump(tree)) + self.assertRaises(TypeError, ast.parse, ast.Constant(42), + mode='func_type') + self.assertRaises(TypeError, ast.parse, tree, mode='exec') + def test_optimization_levels__debug__(self): cases = [(-1, '__debug__'), (0, '__debug__'), (1, False), (2, False)] for (optval, expected) in cases: diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-08-31-10-45-11.gh-issue-156689.Jq3xNv.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-08-31-10-45-11.gh-issue-156689.Jq3xNv.rst new file mode 100644 index 000000000000000..868997320b2f7cb --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-08-31-10-45-11.gh-issue-156689.Jq3xNv.rst @@ -0,0 +1,2 @@ +Fix an out-of-bounds read in :func:`compile` and :func:`ast.parse` when an AST +object is passed with ``mode='func_type'``. diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index 5ad20d49fa4b310..de202aaec8cbbb2 100755 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -2169,22 +2169,25 @@ class PartingShots(StaticVisitor): return result; } -/* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */ +/* mode is 0 for "exec", 1 for "eval", 2 for "single" and 3 for "func_type" + input */ int PyAst_CheckMode(PyObject *ast, int mode) { - const char * const req_name[] = {"Module", "Expression", "Interactive"}; + const char * const req_name[] = {"Module", "Expression", "Interactive", + "FunctionType"}; struct ast_state *state = get_ast_state(); if (state == NULL) { return -1; } - PyObject *req_type[3]; + PyObject *req_type[4]; req_type[0] = state->Module_type; req_type[1] = state->Expression_type; req_type[2] = state->Interactive_type; + req_type[3] = state->FunctionType_type; - assert(0 <= mode && mode <= 2); + assert(0 <= mode && mode <= 3); int isinstance = PyObject_IsInstance(ast, req_type[mode]); if (isinstance == -1) { return -1; diff --git a/Python/Python-ast.c b/Python/Python-ast.c index 1cc88dc179e120d..2dd2f6778d14749 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -18423,22 +18423,25 @@ PyObject* PyAST_mod2obj(mod_ty t) return result; } -/* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */ +/* mode is 0 for "exec", 1 for "eval", 2 for "single" and 3 for "func_type" + input */ int PyAst_CheckMode(PyObject *ast, int mode) { - const char * const req_name[] = {"Module", "Expression", "Interactive"}; + const char * const req_name[] = {"Module", "Expression", "Interactive", + "FunctionType"}; struct ast_state *state = get_ast_state(); if (state == NULL) { return -1; } - PyObject *req_type[3]; + PyObject *req_type[4]; req_type[0] = state->Module_type; req_type[1] = state->Expression_type; req_type[2] = state->Interactive_type; + req_type[3] = state->FunctionType_type; - assert(0 <= mode && mode <= 2); + assert(0 <= mode && mode <= 3); int isinstance = PyObject_IsInstance(ast, req_type[mode]); if (isinstance == -1) { return -1;

1 0

[3.13] gh-156353: Fix configparser space delimiter parsing (GH-156382) (GH-156559)
by encukou Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/5558b550a0b81ec682977a8d25be2e7d05… commit: 5558b550a0b81ec682977a8d25be2e7d055d3148 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: encukou <encukou(a)gmail.com> date: 2026-08-31T14:21:49+02:00 summary: [3.13] gh-156353: Fix configparser space delimiter parsing (GH-156382) (GH-156559) (cherry picked from commit f973bd9d383e99eef58846772c69afa8ebeaf9a9) Signed-off-by: sundeep8967 <sundeep8967(a)gmail.com> Co-authored-by: sundeep8967 <71071718+sundeep8967(a)users.noreply.github.com> Co-authored-by: Petr Viktorin <encukou(a)gmail.com> files: A Misc/NEWS.d/next/Library/2026-08-26-02-30-00.gh-issue-156353.abcdef.rst M Lib/configparser.py M Lib/test/test_configparser.py diff --git a/Lib/configparser.py b/Lib/configparser.py index f1d7ad2c21d6be..8a00519a38fd6e 100644 --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -602,7 +602,8 @@ class RawConfigParser(MutableMapping): _OPT_TMPL = r""" (?P<option> # very permissive! (?:(?!{delim})\S)* # non-delimiter non-whitespace - (?:\s+(?:(?!{delim})\S)+)*) # optionally more words + (?:(?:(?!{delim})\s)+ # optionally more + (?:(?!{delim})\S)+)*) # space-separated words \s*(?P<vi>{delim})\s* # any number of space/tab, # followed by any of the # allowed delimiters, @@ -612,7 +613,8 @@ class RawConfigParser(MutableMapping): _OPT_NV_TMPL = r""" (?P<option> # very permissive! (?:(?!{delim})\S)* # non-delimiter non-whitespace - (?:\s+(?:(?!{delim})\S)+)*) # optionally more words + (?:(?:(?!{delim})\s)+ # optionally more + (?:(?!{delim})\S)+)*) # space-separated words \s*(?: # any number of space/tab, (?P<vi>{delim})\s* # optionally followed by # any of the allowed diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py index 61664d56ea0c12..052ed9c668ff9c 100644 --- a/Lib/test/test_configparser.py +++ b/Lib/test/test_configparser.py @@ -43,7 +43,7 @@ class CfgParserTestCaseClass: default_section = configparser.DEFAULTSECT interpolation = configparser._UNSET - def newconfig(self, defaults=None): + def newconfig(self, defaults=None, **kwargs): arguments = dict( defaults=defaults, allow_no_value=self.allow_no_value, @@ -56,6 +56,7 @@ def newconfig(self, defaults=None): default_section=self.default_section, interpolation=self.interpolation, ) + arguments.update(kwargs) instance = self.config_class(**arguments) return instance @@ -358,6 +359,32 @@ def test_basic(self): the larch {0[1]} 1 """.format(self.delimiters))) + @support.subTests('data', [ + 'foo bar=baz', + 'foo bar=baz', + 'foo=bar=baz', + 'foo = bar=baz', + 'foo\t \t=\t \tbar=baz', + ]) + def test_space_delimiter(self, data): + # gh-156353: Space should be accepted as a delimiter + cf = self.newconfig(delimiters=(' ', '=')) + cf.read_string(f"[all]\n{data}") + self.assertEqual(cf.options('all'), ['foo']) + self.assertEqual(cf.get('all', 'foo'), 'bar=baz') + + @support.subTests('delimiter', ' =:;#x\t\0\N{RS}\N{CEDILLA}\N{CAT}') + @support.subTests('space_before', ['', ' ', '\t', ' \t']) + @support.subTests('space_after', ['', ' ', '\t', ' \t']) + def test_any_delimiter(self, delimiter, space_before, space_after): + cf = self.newconfig( + delimiters=(delimiter,), + inline_comment_prefixes=None, + ) + cf.read_string(f"[all]\nfoo{space_before}{delimiter}{space_after}bar=baz") + self.assertEqual(cf.options('all'), ['foo']) + self.assertEqual(cf.get('all', 'foo'), 'bar=baz') + def test_basic_from_dict(self): config = { "Foo Bar": { @@ -1991,8 +2018,8 @@ class ConvertersTestCase(BasicTestCase, unittest.TestCase): config_class = configparser.ConfigParser - def newconfig(self, defaults=None): - instance = super().newconfig(defaults=defaults) + def newconfig(self, defaults=None, **kwargs): + instance = super().newconfig(defaults=defaults, **kwargs) instance.converters['list'] = lambda v: [e.strip() for e in v.split() if e.strip()] return instance diff --git a/Misc/NEWS.d/next/Library/2026-08-26-02-30-00.gh-issue-156353.abcdef.rst b/Misc/NEWS.d/next/Library/2026-08-26-02-30-00.gh-issue-156353.abcdef.rst new file mode 100644 index 00000000000000..0dd925cf596277 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-08-26-02-30-00.gh-issue-156353.abcdef.rst @@ -0,0 +1 @@ +Fix :mod:`configparser` parsing when using whitespace in *delimiters*.

1 0

[3.14] gh-156353: Fix configparser space delimiter parsing (GH-156382) (GH-156558)
by encukou Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/142d9360d0e3149802d4358cac29eb7063… commit: 142d9360d0e3149802d4358cac29eb7063af729e branch: 3.14 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: encukou <encukou(a)gmail.com> date: 2026-08-31T14:21:24+02:00 summary: [3.14] gh-156353: Fix configparser space delimiter parsing (GH-156382) (GH-156558) (cherry picked from commit f973bd9d383e99eef58846772c69afa8ebeaf9a9) Signed-off-by: sundeep8967 <sundeep8967(a)gmail.com> Co-authored-by: sundeep8967 <71071718+sundeep8967(a)users.noreply.github.com> Co-authored-by: Petr Viktorin <encukou(a)gmail.com> files: A Misc/NEWS.d/next/Library/2026-08-26-02-30-00.gh-issue-156353.abcdef.rst M Lib/configparser.py M Lib/test/test_configparser.py diff --git a/Lib/configparser.py b/Lib/configparser.py index 3c452afe8ade48..88015ef6086569 100644 --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -618,7 +618,8 @@ class RawConfigParser(MutableMapping): _OPT_TMPL = r""" (?P<option> # very permissive! (?:(?!{delim})\S)* # non-delimiter non-whitespace - (?:\s+(?:(?!{delim})\S)+)*) # optionally more words + (?:(?:(?!{delim})\s)+ # optionally more + (?:(?!{delim})\S)+)*) # space-separated words \s*(?P<vi>{delim})\s* # any number of space/tab, # followed by any of the # allowed delimiters, @@ -628,7 +629,8 @@ class RawConfigParser(MutableMapping): _OPT_NV_TMPL = r""" (?P<option> # very permissive! (?:(?!{delim})\S)* # non-delimiter non-whitespace - (?:\s+(?:(?!{delim})\S)+)*) # optionally more words + (?:(?:(?!{delim})\s)+ # optionally more + (?:(?!{delim})\S)+)*) # space-separated words \s*(?: # any number of space/tab, (?P<vi>{delim})\s* # optionally followed by # any of the allowed diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py index 4783943f71a109..7d1e68fe38100e 100644 --- a/Lib/test/test_configparser.py +++ b/Lib/test/test_configparser.py @@ -43,7 +43,7 @@ class CfgParserTestCaseClass: default_section = configparser.DEFAULTSECT interpolation = configparser._UNSET - def newconfig(self, defaults=None): + def newconfig(self, defaults=None, **kwargs): arguments = dict( defaults=defaults, allow_no_value=self.allow_no_value, @@ -56,6 +56,7 @@ def newconfig(self, defaults=None): default_section=self.default_section, interpolation=self.interpolation, ) + arguments.update(kwargs) instance = self.config_class(**arguments) return instance @@ -358,6 +359,32 @@ def test_basic(self): the larch {0[1]} 1 """.format(self.delimiters))) + @support.subTests('data', [ + 'foo bar=baz', + 'foo bar=baz', + 'foo=bar=baz', + 'foo = bar=baz', + 'foo\t \t=\t \tbar=baz', + ]) + def test_space_delimiter(self, data): + # gh-156353: Space should be accepted as a delimiter + cf = self.newconfig(delimiters=(' ', '=')) + cf.read_string(f"[all]\n{data}") + self.assertEqual(cf.options('all'), ['foo']) + self.assertEqual(cf.get('all', 'foo'), 'bar=baz') + + @support.subTests('delimiter', ' =:;#x\t\0\N{RS}\N{CEDILLA}\N{CAT}') + @support.subTests('space_before', ['', ' ', '\t', ' \t']) + @support.subTests('space_after', ['', ' ', '\t', ' \t']) + def test_any_delimiter(self, delimiter, space_before, space_after): + cf = self.newconfig( + delimiters=(delimiter,), + inline_comment_prefixes=None, + ) + cf.read_string(f"[all]\nfoo{space_before}{delimiter}{space_after}bar=baz") + self.assertEqual(cf.options('all'), ['foo']) + self.assertEqual(cf.get('all', 'foo'), 'bar=baz') + def test_basic_from_dict(self): config = { "Foo Bar": { @@ -1991,8 +2018,8 @@ class ConvertersTestCase(BasicTestCase, unittest.TestCase): config_class = configparser.ConfigParser - def newconfig(self, defaults=None): - instance = super().newconfig(defaults=defaults) + def newconfig(self, defaults=None, **kwargs): + instance = super().newconfig(defaults=defaults, **kwargs) instance.converters['list'] = lambda v: [e.strip() for e in v.split() if e.strip()] return instance diff --git a/Misc/NEWS.d/next/Library/2026-08-26-02-30-00.gh-issue-156353.abcdef.rst b/Misc/NEWS.d/next/Library/2026-08-26-02-30-00.gh-issue-156353.abcdef.rst new file mode 100644 index 00000000000000..0dd925cf596277 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-08-26-02-30-00.gh-issue-156353.abcdef.rst @@ -0,0 +1 @@ +Fix :mod:`configparser` parsing when using whitespace in *delimiters*.

1 0

gh-156689: Fix out-of-bounds read in `PyAst_CheckMode()` for `mode='func_type'` (#156697)
by StanFromIreland Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/d7f9c6400f49633221983d0c454cf27ecb… commit: d7f9c6400f49633221983d0c454cf27ecb0302ba branch: main author: Stan Ulbrych <stan(a)python.org> committer: StanFromIreland <stan(a)python.org> date: 2026-08-31T12:49:03+01:00 summary: gh-156689: Fix out-of-bounds read in `PyAst_CheckMode()` for `mode='func_type'` (#156697) files: A Misc/NEWS.d/next/Core_and_Builtins/2026-08-31-10-45-11.gh-issue-156689.Jq3xNv.rst M Doc/library/ast.rst M Lib/test/test_ast/test_ast.py M Parser/asdl_c.py M Python/Python-ast.c diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst index ab2a668f590afd8..e30dadc9733d37b 100644 --- a/Doc/library/ast.rst +++ b/Doc/library/ast.rst @@ -2254,7 +2254,7 @@ and classes for traversing abstract syntax trees: In addition, if ``mode`` is ``'func_type'``, the input syntax is modified to correspond to :pep:`484` "signature type comments", - e.g. ``(str, int) -> List[str]``. + for example ``(str, int) -> List[str]``. Setting ``feature_version`` to a tuple ``(major, minor)`` will result in a "best-effort" attempt to parse using that Python version's grammar. diff --git a/Lib/test/test_ast/test_ast.py b/Lib/test/test_ast/test_ast.py index 7d35fc4ef7c3644..92ef9c633e1d47e 100644 --- a/Lib/test/test_ast/test_ast.py +++ b/Lib/test/test_ast/test_ast.py @@ -162,6 +162,15 @@ def test_parse_invalid_ast(self): self.assertRaises(TypeError, ast.parse, ast.Constant(42), optimize=optval) + def test_parse_ast_func_type(self): + # see gh-156689 + tree = ast.parse('(int, str) -> bool', mode='func_type') + self.assertEqual(ast.dump(ast.parse(tree, mode='func_type')), + ast.dump(tree)) + self.assertRaises(TypeError, ast.parse, ast.Constant(42), + mode='func_type') + self.assertRaises(TypeError, ast.parse, tree, mode='exec') + def test_optimization_levels__debug__(self): cases = [(-1, '__debug__'), (0, '__debug__'), (1, False), (2, False)] for (optval, expected) in cases: diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-08-31-10-45-11.gh-issue-156689.Jq3xNv.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-08-31-10-45-11.gh-issue-156689.Jq3xNv.rst new file mode 100644 index 000000000000000..868997320b2f7cb --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-08-31-10-45-11.gh-issue-156689.Jq3xNv.rst @@ -0,0 +1,2 @@ +Fix an out-of-bounds read in :func:`compile` and :func:`ast.parse` when an AST +object is passed with ``mode='func_type'``. diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index d53886866f54f86..b2581e48810b893 100755 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -2122,22 +2122,25 @@ class PartingShots(StaticVisitor): return result; } -/* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */ +/* mode is 0 for "exec", 1 for "eval", 2 for "single" and 3 for "func_type" + input */ int PyAst_CheckMode(PyObject *ast, int mode) { - const char * const req_name[] = {"Module", "Expression", "Interactive"}; + const char * const req_name[] = {"Module", "Expression", "Interactive", + "FunctionType"}; struct ast_state *state = get_ast_state(); if (state == NULL) { return -1; } - PyObject *req_type[3]; + PyObject *req_type[4]; req_type[0] = state->Module_type; req_type[1] = state->Expression_type; req_type[2] = state->Interactive_type; + req_type[3] = state->FunctionType_type; - assert(0 <= mode && mode <= 2); + assert(0 <= mode && mode <= 3); int isinstance = PyObject_IsInstance(ast, req_type[mode]); if (isinstance == -1) { return -1; diff --git a/Python/Python-ast.c b/Python/Python-ast.c index f36072dfce098c6..383384fc1706b47 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -18549,22 +18549,25 @@ PyObject* PyAST_mod2obj(mod_ty t) return result; } -/* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */ +/* mode is 0 for "exec", 1 for "eval", 2 for "single" and 3 for "func_type" + input */ int PyAst_CheckMode(PyObject *ast, int mode) { - const char * const req_name[] = {"Module", "Expression", "Interactive"}; + const char * const req_name[] = {"Module", "Expression", "Interactive", + "FunctionType"}; struct ast_state *state = get_ast_state(); if (state == NULL) { return -1; } - PyObject *req_type[3]; + PyObject *req_type[4]; req_type[0] = state->Module_type; req_type[1] = state->Expression_type; req_type[2] = state->Interactive_type; + req_type[3] = state->FunctionType_type; - assert(0 <= mode && mode <= 2); + assert(0 <= mode && mode <= 3); int isinstance = PyObject_IsInstance(ast, req_type[mode]); if (isinstance == -1) { return -1;

1 0

[3.15] gh-57952: Clarify that xml.dom documents DOM interfaces (GH-156647) (#156651)
by hugovk Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/502191f73924c4c84eff8e043467e67d86… commit: 502191f73924c4c84eff8e043467e67d864d890a branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2026-08-31T13:00:27+03:00 summary: [3.15] gh-57952: Clarify that xml.dom documents DOM interfaces (GH-156647) (#156651) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Doc/library/xml.dom.rst diff --git a/Doc/library/xml.dom.rst b/Doc/library/xml.dom.rst index 97573388458ac5..9617e6c7105b26 100644 --- a/Doc/library/xml.dom.rst +++ b/Doc/library/xml.dom.rst @@ -153,6 +153,11 @@ Objects in the DOM The definitive documentation for the DOM is the DOM specification from the W3C. +The names documented in this section are DOM interfaces. +With the exception of :class:`Node` and the exception classes, +they are not provided by the :mod:`!xml.dom` module itself, +but by concrete DOM implementations, such as :mod:`xml.dom.minidom`. + Note that DOM attributes may also be manipulated as nodes instead of as simple strings. It is fairly rare that you must do this, however, so this usage is not yet documented.

1 0

[3.15] gh-156635: Fix the exceptions in the xml.dom documentation (GH-156636) (#156637)
by hugovk Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/00347e222316ee624df027525a62a28065… commit: 00347e222316ee624df027525a62a2806594d756 branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2026-08-31T12:59:53+03:00 summary: [3.15] gh-156635: Fix the exceptions in the xml.dom documentation (GH-156636) (#156637) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Doc/library/xml.dom.minidom.rst M Doc/library/xml.dom.rst diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst index dcde403ee27dea..ded3859192fd83 100644 --- a/Doc/library/xml.dom.minidom.rst +++ b/Doc/library/xml.dom.minidom.rst @@ -264,6 +264,11 @@ rules apply: * :attr:`~xml.dom.Document.strictErrorChecking` and :attr:`~xml.dom.Attr.specified` are always ``False``. +* :meth:`~xml.dom.Element.removeAttribute` and + :meth:`~xml.dom.Element.removeAttributeNS` raise + :exc:`~xml.dom.NotFoundErr` if there is no matching attribute, + while the DOM specifies that this has no effect. + The following interfaces have no implementation in :mod:`!xml.dom.minidom`: * :class:`DOMTimeStamp` diff --git a/Doc/library/xml.dom.rst b/Doc/library/xml.dom.rst index 81e58cff321a47..97573388458ac5 100644 --- a/Doc/library/xml.dom.rst +++ b/Doc/library/xml.dom.rst @@ -461,7 +461,7 @@ for each node type are: .. method:: Node.insertBefore(newChild, refChild) Insert a new child node before an existing child. It must be the case that - *refChild* is a child of this node; if not, :exc:`ValueError` is raised. + *refChild* is a child of this node; if not, :exc:`NotFoundErr` is raised. *newChild* is returned. If *refChild* is ``None``, it inserts *newChild* at the end of the children's list. @@ -469,7 +469,7 @@ for each node type are: .. method:: Node.removeChild(oldChild) Remove a child node. *oldChild* must be a child of this node; if not, - :exc:`ValueError` is raised. *oldChild* is returned on success. If *oldChild* + :exc:`NotFoundErr` is raised. *oldChild* is returned on success. If *oldChild* will not be used further, its :meth:`~xml.dom.minidom.Node.unlink` method should be called. @@ -477,7 +477,7 @@ for each node type are: .. method:: Node.replaceChild(newChild, oldChild) Replace an existing node with a new node. It must be the case that *oldChild* - is a child of this node; if not, :exc:`ValueError` is raised. + is a child of this node; if not, :exc:`NotFoundErr` is raised. .. method:: Node.normalize() @@ -826,8 +826,7 @@ of that class. .. method:: Element.removeAttribute(name) - Remove an attribute by name. If there is no matching attribute, a - :exc:`NotFoundErr` is raised. + Remove an attribute by name. .. method:: Element.removeAttributeNode(oldAttr) @@ -838,8 +837,7 @@ of that class. .. method:: Element.removeAttributeNS(namespaceURI, localName) - Remove an attribute by name. Note that it uses a localName, not a qname. No - exception is raised if there is no matching attribute. + Remove an attribute by name. Note that it uses a localName, not a qname. .. method:: Element.setAttribute(name, value)

1 0

[3.15] gh-115075: Fix info about initialization of mimetypes.MimeTypes attributes (GH-150691) (#156625)
by hugovk Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/9b7ba24dab0953af7be04ebd9b807c549c… commit: 9b7ba24dab0953af7be04ebd9b807c549c5995c0 branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2026-08-31T12:59:35+03:00 summary: [3.15] gh-115075: Fix info about initialization of mimetypes.MimeTypes attributes (GH-150691) (#156625) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Doc/library/mimetypes.rst diff --git a/Doc/library/mimetypes.rst b/Doc/library/mimetypes.rst index 0d512a0b6b8acc..761b4409219c35 100644 --- a/Doc/library/mimetypes.rst +++ b/Doc/library/mimetypes.rst @@ -201,8 +201,8 @@ than one MIME-type database; it provides an interface similar to the one of the .. class:: MimeTypes(filenames=(), strict=True) This class represents a MIME-types database. By default, it provides access to - the same database as the rest of this module. The initial database is a copy of - that provided by the module, and may be extended by loading additional + the same database as the rest of this module. The initial database is created from + Python's built-in MIME type tables. It may be extended by loading additional :file:`mime.types`\ -style files into the database using the :meth:`read` or :meth:`readfp` methods. The mapping dictionaries may also be cleared before loading additional data if the default data is not desired. @@ -216,30 +216,32 @@ than one MIME-type database; it provides an interface similar to the one of the Dictionary mapping suffixes to suffixes. This is used to allow recognition of encoded files for which the encoding and the type are indicated by the same extension. For example, the :file:`.tgz` extension is mapped to :file:`.tar.gz` - to allow the encoding and type to be recognized separately. This is initially a - copy of the global :data:`suffix_map` defined in the module. + to allow the encoding and type to be recognized separately. + This is initialized with some predefined values. .. attribute:: MimeTypes.encodings_map - Dictionary mapping filename extensions to encoding types. This is initially a - copy of the global :data:`encodings_map` defined in the module. + Dictionary mapping filename extensions to encoding types. + This is initialized with some predefined values. .. attribute:: MimeTypes.types_map Tuple containing two dictionaries, mapping filename extensions to MIME types: the first dictionary is for the non-standards types and the second one is for - the standard types. They are initialized by :data:`common_types` and - :data:`types_map`. + the standard types. + They are initialized with some predefined values and MIME type + information loaded from files specified by the *filenames* argument. .. attribute:: MimeTypes.types_map_inv Tuple containing two dictionaries, mapping MIME types to a list of filename extensions: the first dictionary is for the non-standards types and the - second one is for the standard types. They are initialized by - :data:`common_types` and :data:`types_map`. + second one is for the standard types. + They are initialized with some predefined values and MIME type + information loaded from files specified by the *filenames* argument. .. method:: MimeTypes.guess_extension(type, strict=True)

1 0

[3.15] gh-155468: Distinguish empty quoted tokens from EOF in netrc (GH-155471) (#156464)
by hugovk Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/3670de02df448345670dc0953383c930d3… commit: 3670de02df448345670dc0953383c930d3cc2ecf branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2026-08-31T12:51:14+03:00 summary: [3.15] gh-155468: Distinguish empty quoted tokens from EOF in netrc (GH-155471) (#156464) Co-authored-by: stevens <lipengyu(a)kylinos.cn> files: A Misc/NEWS.d/next/Library/2026-08-10-15-24-13.gh-issue-155468.W7qL2p.rst M Lib/netrc.py M Lib/test/test_netrc.py diff --git a/Lib/netrc.py b/Lib/netrc.py index a28ea297df894b..cb1e3782a01c14 100644 --- a/Lib/netrc.py +++ b/Lib/netrc.py @@ -48,11 +48,12 @@ def _read_char(self): def get_token(self): if self.pushback: return self.pushback.pop(0) - token = "" + token = None fiter = iter(self._read_char, "") for ch in fiter: if ch in self.whitespace: continue + token = "" if ch == '"': for ch in fiter: if ch == '"': @@ -96,9 +97,9 @@ def _parse(self, file, fp, default_netrc): # Look for a machine, default, or macdef top-level keyword saved_lineno = lexer.lineno tt = lexer.get_token() - if not tt: + if tt is None: break - elif tt[0] == '#': + elif tt.startswith('#'): if lexer.lineno == saved_lineno and len(tt) == 1: lexer.instream.readline() continue @@ -135,20 +136,20 @@ def _parse(self, file, fp, default_netrc): while 1: prev_lineno = lexer.lineno tt = lexer.get_token() - if tt.startswith('#'): + if tt is not None and tt.startswith('#'): if lexer.lineno == prev_lineno: lexer.instream.readline() continue - if tt in {'', 'machine', 'default', 'macdef'}: + if tt in {None, 'machine', 'default', 'macdef'}: self.hosts[entryname] = (login, account, password) lexer.push_token(tt) break elif tt == 'login' or tt == 'user': - login = lexer.get_token() + login = lexer.get_token() or '' elif tt == 'account': - account = lexer.get_token() + account = lexer.get_token() or '' elif tt == 'password': - password = lexer.get_token() + password = lexer.get_token() or '' else: raise NetrcParseError("bad follower token %r" % tt, file, lexer.lineno) diff --git a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py index 354081e96213a6..bbb49bf15ce8f1 100644 --- a/Lib/test/test_netrc.py +++ b/Lib/test/test_netrc.py @@ -62,6 +62,9 @@ def test_optional_tokens(self): "machine host.domain.com login", "machine host.domain.com account", "machine host.domain.com password", + "machine host.domain.com login \"\"", + "machine host.domain.com account \"\"", + "machine host.domain.com password \"\"", "machine host.domain.com login \"\" account", "machine host.domain.com login \"\" password", "machine host.domain.com account \"\" password" @@ -74,6 +77,9 @@ def test_optional_tokens(self): "default login", "default account", "default password", + "default login \"\"", + "default account \"\"", + "default password \"\"", "default login \"\" account", "default login \"\" password", "default account \"\" password" @@ -82,6 +88,15 @@ def test_optional_tokens(self): nrc = self.make_nrc(item) self.assertEqual(nrc.hosts['default'], ('', '', '')) + def test_empty_quoted_token_is_not_eof(self): + data = ( + '"" invalid', + 'machine host.domain.com "" invalid', + ) + for item in data: + with self.subTest(item=item): + self.assertRaises(netrc.NetrcParseError, self.make_nrc, item) + def test_invalid_tokens(self): data = ( "invalid host.domain.com", diff --git a/Misc/NEWS.d/next/Library/2026-08-10-15-24-13.gh-issue-155468.W7qL2p.rst b/Misc/NEWS.d/next/Library/2026-08-10-15-24-13.gh-issue-155468.W7qL2p.rst new file mode 100644 index 00000000000000..4d495b9de62fa5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-08-10-15-24-13.gh-issue-155468.W7qL2p.rst @@ -0,0 +1,2 @@ +Fix :mod:`netrc` to distinguish empty quoted tokens from end-of-file, so +malformed files no longer cause the remaining content to be silently ignored.

1 0

[3.15] gh-156408: Fix asyncio.print_call_graph() on a finished task (GH-156410) (#156563)
by hugovk Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/5e8912e2a34c382759fe90d3a65a0863b7… commit: 5e8912e2a34c382759fe90d3a65a0863b7c60d53 branch: 3.15 author: An Long <aisk(a)users.noreply.github.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2026-08-31T12:50:05+03:00 summary: [3.15] gh-156408: Fix asyncio.print_call_graph() on a finished task (GH-156410) (#156563) Co-authored-by: Timofei Ivankov <128279579+deadlovelll(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2026-08-26-12-48-10.gh-issue-156408.-Yd0k7.rst M Lib/asyncio/graph.py M Lib/test/test_asyncio/test_graph.py diff --git a/Lib/asyncio/graph.py b/Lib/asyncio/graph.py index 35f7fa62140bd49..54df7afa5553b97 100644 --- a/Lib/asyncio/graph.py +++ b/Lib/asyncio/graph.py @@ -58,7 +58,8 @@ def _build_graph_for_future( while coro is not None: if hasattr(coro, 'cr_await'): # A native coroutine or duck-type compatible iterator - st.append(FrameCallGraphEntry(coro.cr_frame)) + if coro.cr_frame is not None: + st.append(FrameCallGraphEntry(coro.cr_frame)) coro = coro.cr_await elif hasattr(coro, 'ag_await'): # A native async generator or duck-type compatible iterator diff --git a/Lib/test/test_asyncio/test_graph.py b/Lib/test/test_asyncio/test_graph.py index ab7576d25e231ed..690f8f58b8f10da 100644 --- a/Lib/test/test_asyncio/test_graph.py +++ b/Lib/test/test_asyncio/test_graph.py @@ -407,6 +407,24 @@ async def main(): self.assertTrue(stack_for_fut[1].startswith('* Future(id=')) + async def test_call_graph_finished_task(self): + # gh-156408: the call graph must not record a finished coroutine's None frame + async def boom(): + raise ValueError + + done = asyncio.create_task(asyncio.sleep(0), name='done') + failed = asyncio.create_task(boom(), name='failed') + cancelled = asyncio.create_task(asyncio.Event().wait(), name='cancelled') + cancelled.cancel() + await asyncio.gather(done, failed, cancelled, return_exceptions=True) + + for task in (done, failed, cancelled): + with self.subTest(task=task.get_name()): + buf = io.StringIO() + asyncio.print_call_graph(task, file=buf) + self.assertEqual(asyncio.capture_call_graph(task).call_stack, ()) + self.assertIn(f"name={task.get_name()!r}", buf.getvalue()) + @unittest.skipIf( not hasattr(asyncio.futures, "_c_future_add_to_awaited_by"), diff --git a/Misc/NEWS.d/next/Library/2026-08-26-12-48-10.gh-issue-156408.-Yd0k7.rst b/Misc/NEWS.d/next/Library/2026-08-26-12-48-10.gh-issue-156408.-Yd0k7.rst new file mode 100644 index 000000000000000..62c92838b5c1266 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-08-26-12-48-10.gh-issue-156408.-Yd0k7.rst @@ -0,0 +1,2 @@ +Fix :func:`asyncio.print_call_graph` raising :exc:`AttributeError` when +called on a task that has already finished.

1 0

[3.15] gh-156466: Fix additional compiler scope cleanup errors (GH-156547) (#156571)
by hugovk Aug. 31, 2026

Aug. 31, 2026

https://github.com/python/cpython/commit/164d5fb91a9476ecd1d4ecfffa34f1e726… commit: 164d5fb91a9476ecd1d4ecfffa34f1e72634d219 branch: 3.15 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2026-08-31T12:49:27+03:00 summary: [3.15] gh-156466: Fix additional compiler scope cleanup errors (GH-156547) (#156571) Co-authored-by: Jelle Zijlstra <jelle.zijlstra(a)gmail.com> files: M Python/codegen.c M Python/compile.c diff --git a/Python/codegen.c b/Python/codegen.c index 529c1733598e38..dbe889c5441182 100644 --- a/Python/codegen.c +++ b/Python/codegen.c @@ -1608,7 +1608,7 @@ codegen_class_body(compiler *c, stmt_ty s, int firstlineno) ADDOP_N_IN_SCOPE(c, loc, STORE_DEREF, &_Py_ID(__classdict__), cellvars); } if (SYMTABLE_ENTRY(c)->ste_has_conditional_annotations) { - ADDOP_I(c, loc, BUILD_SET, 0); + ADDOP_I_IN_SCOPE(c, loc, BUILD_SET, 0); ADDOP_N_IN_SCOPE(c, loc, STORE_DEREF, &_Py_ID(__conditional_annotations__), cellvars); } /* compile the body proper */ diff --git a/Python/compile.c b/Python/compile.c index fefb2b04b78db8..2717037a988ec7 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -1735,7 +1735,9 @@ _PyCompile_CodeGen(PyObject *ast, PyObject *filename, PyCompilerFlags *pflags, finally: Py_XDECREF(consts_list); Py_XDECREF(metadata); - _PyCompile_ExitScope(c); + if (c->u != NULL) { + _PyCompile_ExitScope(c); + } compiler_free(c); _PyArena_Free(arena); return res;

1 0