Skip to content

[3.14] gh-157406: Report all document type declarations in the Python XMLParser (GH-157408) #157409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 1 commit into from
Sep 13, 2026
+29 −33
Merged

[3.14] gh-157406: Report all document type declarations in the Python XMLParser (GH-157408) #157409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Lib/test/test_xml_etree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4002,6 +4002,21 @@ def close(self):
('html', '-//W3C//DTD XHTML 1.0 Transitional//EN',
'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'))

for doctype, expected in [
('<!DOCTYPE html>', ('html', None, None)),
('<!DOCTYPE html [<!ENTITY e "v">]>', ('html', None, None)),
('<!DOCTYPE html SYSTEM "a.dtd">', ('html', None, 'a.dtd')),
('<!DOCTYPE html SYSTEM "a.dtd" [<!ENTITY e "v">]>',
('html', None, 'a.dtd')),
('<!DOCTYPE html PUBLIC "-//P" "a.dtd">', ('html', '-//P', 'a.dtd')),
("<!DOCTYPE\nhtml\nPUBLIC\n'-//P'\n'a.dtd'\n>",
('html', '-//P', 'a.dtd')),
]:
with self.subTest(doctype=doctype):
parser = ET.XMLParser(target=DoctypeParser())
parser.feed(doctype + '<html/>')
self.assertEqual(parser.close(), expected)

def test_builder_lookup_errors(self):
class RaisingBuilder:
def __init__(self, raise_in=None, what=ValueError):
Expand Down
43 changes: 10 additions & 33 deletions Lib/xml/etree/ElementTree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1572,10 +1572,10 @@ def __init__(self, *, target=None, encoding=None):
parser.CommentHandler = target.comment
if hasattr(target, 'pi'):
parser.ProcessingInstructionHandler = target.pi
parser.StartDoctypeDeclHandler = self._start_doctype
# Configure pyexpat: buffering, new-style attribute handling.
parser.buffer_text = 1
parser.ordered_attributes = 1
self._doctype = None
self.entity = {}
try:
self.version = "Expat %d.%d.%d" % expat.version_info
Expand Down Expand Up @@ -1694,38 +1694,15 @@ def _default(self, text):
err.lineno = self.parser.ErrorLineNumber
err.offset = self.parser.ErrorColumnNumber
raise err
elif prefix == "<" and text[:9] == "<!DOCTYPE":
self._doctype = [] # inside a doctype declaration
elif self._doctype is not None:
# parse doctype contents
if prefix == ">":
self._doctype = None
return
text = text.strip(_XML_WHITESPACE)
if not text:
return
self._doctype.append(text)
n = len(self._doctype)
if n > 2:
type = self._doctype[1]
if type == "PUBLIC" and n == 4:
name, type, pubid, system = self._doctype
if pubid:
pubid = pubid[1:-1]
elif type == "SYSTEM" and n == 3:
name, type, system = self._doctype
pubid = None
else:
return
if hasattr(self.target, "doctype"):
self.target.doctype(name, pubid, system[1:-1])
elif hasattr(self, "doctype"):
warnings.warn(
"The doctype() method of XMLParser is ignored. "
"Define doctype() method on the TreeBuilder target.",
RuntimeWarning)

self._doctype = None

def _start_doctype(self, name, system, pubid, has_internal_subset):
if hasattr(self.target, "doctype"):
self.target.doctype(name, pubid, system)
elif hasattr(self, "doctype"):
warnings.warn(
"The doctype() method of XMLParser is ignored. "
"Define doctype() method on the TreeBuilder target.",
RuntimeWarning)

def feed(self, data):
"""Feed encoded data to parser."""
Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Library/2026-09-13-10-30-00.gh-issue-157406.a3kZq7.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix the Python implementation of :class:`xml.etree.ElementTree.XMLParser`:
the ``doctype()`` method of the target is now called for a document type
declaration without an external identifier, like ``<!DOCTYPE html>``,
as in the C implementation.
Loading