Skip to content

gh-128302: fix apparent bug in xml.dom.xmlbuilder.DOMBuilder.parse() #128284

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
merged 7 commits into from
Jan 7, 2025
Merged

gh-128302: fix apparent bug in xml.dom.xmlbuilder.DOMBuilder.parse() #128284

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bcf9cc1
fix apparent bug in xml.dom.xmlbuilder.DOMBuilder.parse()
tungol Dec 27, 2024
4e2c24c
add NEWS entry
tungol Dec 28, 2024
6ce5ebd
update DOMEntityResolver._guess_media_encoding for python 3
tungol Dec 28, 2024
9a0d009
update NEWS
tungol Dec 28, 2024
ad5275c
split the NEWS entry into two, and simplify _guess_media_encoding
tungol Dec 29, 2024
b0cfb6a
use Message.get_param
tungol Jan 6, 2025
737f856
add a few tests for xml.dom.xmlbuilder
tungol Jan 7, 2025
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
8 changes: 4 additions & 4 deletions Lib/xml/dom/xmlbuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def parse(self, input):
options.filter = self.filter
options.errorHandler = self.errorHandler
fp = input.byteStream
if fp is None and options.systemId:
if fp is None and input.systemId:
import urllib.request
fp = urllib.request.urlopen(input.systemId)
return self._parse_bytestream(fp, options)
Expand Down Expand Up @@ -248,9 +248,9 @@ def _create_opener(self):
def _guess_media_encoding(self, source):
info = source.byteStream.info()
if "Content-Type" in info:
for param in info.getplist():
if param.startswith("charset="):
return param.split("=", 1)[1].lower()
for param in info.get_params([]):
if param[0] == 'charset':
return param[1].lower()


class DOMInputSource(object):
Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Library/2024-12-27-16-28-57.gh-issue-128302.2GMvyl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Allow :meth:`!xml.dom.xmlbuilder.DOMParser.parse` to correctly handle
:class:`!xml.dom.xmlbuilder.DOMInputSource` instances that only have a
:attr:`!systemId` attribute set. Also, fix the broken
:meth:`!xml.dom.xmlbuilder.DOMEntityResolver.resolveEntity` method.
Loading