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
Do not apply default namespace to attribute names 
Unprefixed attributes are considered to not be in any namespace,
according to the XML namespaces spec.

This also fixes issue 17088, since the exception that rejects
non-qualified names when using the default_namespace option is
no longer raised when serializing an attribute name.
  • Loading branch information
@mthuurne
mthuurne committed Dec 9, 2018
commit d80197ecd9c2e0f9bdecdf07e1e83689d5aab717
12 changes: 6 additions & 6 deletions Lib/xml/etree/ElementTree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,11 +844,11 @@ def _namespaces(elem, default_namespace=None):
# maps uri:s to prefixes
namespaces = {}

def serialize_qname(qname):
def serialize_qname(qname, is_attr):
# calculate serialized qname representation
if qname[:1] == "{":
uri, local = qname[1:].rsplit("}", 1)
if uri == default_namespace:
if not is_attr and uri == default_namespace:
prefix = ""
else:
prefix = namespaces.get(uri)
Expand All @@ -863,10 +863,10 @@ def serialize_qname(qname):
else:
return local # default element
else:
if default_namespace:
if not is_attr and default_namespace:
# FIXME: can this be handled in XML 1.0?
raise ValueError(
"cannot use non-qualified name (%s) with "
"cannot use non-qualified name (<%s>) with "
"default_namespace option" % qname
)
return qname
Expand All @@ -875,11 +875,11 @@ def add_qname(qname, is_attr=False):
ser_tag, ser_attr = qnames.get(qname, (None, None))
if is_attr:
if ser_attr is None:
ser_attr = serialize_qname(qname)
ser_attr = serialize_qname(qname, True)
qnames[qname] = (ser_tag, ser_attr)
else:
if ser_tag is None:
ser_tag = serialize_qname(qname)
ser_tag = serialize_qname(qname, False)
qnames[qname] = (ser_tag, ser_attr)

# populate qname and namespaces table
Expand Down