Skip to content

bpo-17088: Fix handling of XML attributes when serializing with default namespace #11050

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

Closed
mthuurne wants to merge 12 commits into from
Closed

bpo-17088: Fix handling of XML attributes when serializing with default namespace #11050

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a6c78ce
Include rejected unqualified name in exception from ElementTree.write()
mthuurne Dec 8, 2018
e0d6f6a
Rename internal variable for clarity
mthuurne Dec 9, 2018
5e200cf
Move handling of invalid attribute name types out of add_qname()
mthuurne Dec 9, 2018
34e6b95
Separate serialized name computation from cache population
mthuurne Dec 9, 2018
71119f5
Store separate local:prefix string in qnames cache for attributes
mthuurne Dec 9, 2018
11c924a
Only fill tag/attribute part of qnames cache when it is actually used
mthuurne Dec 9, 2018
4a07bca
Add default namespace to mapping after filling the qnames cache
mthuurne Dec 9, 2018
4cf93e1
Have _namespaces() return a mapping from prefix to namespace
mthuurne Dec 9, 2018
6bf5eab
Add ElementTree test for unqualified attribute names
mthuurne Dec 8, 2018
d80197e
Do not apply default namespace to attribute names
mthuurne Dec 9, 2018
31c32a3
Avoid serializing qname twice when no default_namespace is used
mthuurne Dec 9, 2018
52c4b8e
Add NEWS.d item for ElementTree attribute serialization with default …
mthuurne Dec 9, 2018
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
Prev Previous commit
Next Next commit
Store separate local:prefix string in qnames cache for attributes 
This is in preparation of a future change that requires the default
namespace to not be applied to attributes.
  • Loading branch information
@mthuurne
mthuurne committed Dec 9, 2018
commit 71119f5f0a9515cab86d31f608e93c32ad99c3e6
21 changes: 12 additions & 9 deletions Lib/xml/etree/ElementTree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,8 +836,10 @@ def _get_writer(file_or_filename, encoding):
def _namespaces(elem, default_namespace=None):
# identify namespaces used in this tree

# maps qnames to *encoded* prefix:local names
qnames = {None: None}
# maps qnames to *encoded* prefix:local names,
# value is a pair of prefix:local strings,
# second value is for attribute names
qnames = {None: (None, None)}

# maps uri:s to prefixes
namespaces = {}
Expand Down Expand Up @@ -870,7 +872,8 @@ def serialize_qname(qname):

def add_qname(qname):
if qname not in qnames:
qnames[qname] = serialize_qname(qname)
serialized = serialize_qname(qname)
qnames[qname] = (serialized, serialized)

# populate qname and namespaces table
for elem in elem.iter():
Expand Down Expand Up @@ -903,7 +906,7 @@ def _serialize_xml(write, elem, qnames, namespaces,
elif tag is ProcessingInstruction:
write("<?%s?>" % text)
else:
tag = qnames[tag]
tag = qnames[tag][0]
if tag is None:
if text:
write(_escape_cdata(text))
Expand All @@ -927,10 +930,10 @@ def _serialize_xml(write, elem, qnames, namespaces,
if isinstance(k, QName):
k = k.text
if isinstance(v, QName):
v = qnames[v.text]
v = qnames[v.text][0]
else:
v = _escape_attrib(v)
write(" %s=\"%s\"" % (qnames[k], v))
write(" %s=\"%s\"" % (qnames[k][1], v))
if text or len(elem) or not short_empty_elements:
write(">")
if text:
Expand Down Expand Up @@ -960,7 +963,7 @@ def _serialize_html(write, elem, qnames, namespaces, **kwargs):
elif tag is ProcessingInstruction:
write("<?%s?>" % _escape_cdata(text))
else:
tag = qnames[tag]
tag = qnames[tag][0]
if tag is None:
if text:
write(_escape_cdata(text))
Expand All @@ -983,11 +986,11 @@ def _serialize_html(write, elem, qnames, namespaces, **kwargs):
if isinstance(k, QName):
k = k.text
if isinstance(v, QName):
v = qnames[v.text]
v = qnames[v.text][0]
else:
v = _escape_attrib_html(v)
# FIXME: handle boolean attributes
write(" %s=\"%s\"" % (qnames[k], v))
write(" %s=\"%s\"" % (qnames[k][1], v))
write(">")
ltag = tag.lower()
if text:
Expand Down