traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-41900: C14N 2.0 serialisation failed for unprefixed attributes when a default namespace was defined. (GH-22474)

This commit is contained in:
scoder 2020-10-03 08:07:07 +02:00 committed by GitHub
parent d4b9edd505
commit 6a412c94b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_xml_etree.py
View File

@ -3899,6 +3899,14 @@ class C14NTest(unittest.TestCase):
#self.assertEqual(c14n_roundtrip("<doc xmlns:x='http://example.com/x' xmlns='http://example.com/default'><b y:a1='1' xmlns='http://example.com/default' a3='3' xmlns:y='http://example.com/y' y:a2='2'/></doc>"), #self.assertEqual(c14n_roundtrip("<doc xmlns:x='http://example.com/x' xmlns='http://example.com/default'><b y:a1='1' xmlns='http://example.com/default' a3='3' xmlns:y='http://example.com/y' y:a2='2'/></doc>"),
#'<doc xmlns:x="http://example.com/x"><b xmlns:y="http://example.com/y" a3="3" y:a1="1" y:a2="2"></b></doc>') #'<doc xmlns:x="http://example.com/x"><b xmlns:y="http://example.com/y" a3="3" y:a1="1" y:a2="2"></b></doc>')
# Namespace issues
xml = '<X xmlns="http://nps/a"><Y targets="abc,xyz"></Y></X>'
self.assertEqual(c14n_roundtrip(xml), xml)
xml = '<X xmlns="http://nps/a"><Y xmlns="http://nsp/b" targets="abc,xyz"></Y></X>'
self.assertEqual(c14n_roundtrip(xml), xml)
xml = '<X xmlns="http://nps/a"><Y xmlns:b="http://nsp/b" b:targets="abc,xyz"></Y></X>'
self.assertEqual(c14n_roundtrip(xml), xml)
def test_c14n_exclusion(self): def test_c14n_exclusion(self):
xml = textwrap.dedent("""\ xml = textwrap.dedent("""\
<root xmlns:x="http://example.com/x"> <root xmlns:x="http://example.com/x">

5
Lib/xml/etree/ElementTree.py
View File

@ -1876,6 +1876,11 @@ class C14NWriterTarget:
self._declared_ns_stack[-1].append((uri, prefix)) self._declared_ns_stack[-1].append((uri, prefix))
return f'{prefix}:{tag}' if prefix else tag, tag, uri return f'{prefix}:{tag}' if prefix else tag, tag, uri
if not uri:
# As soon as a default namespace is defined,
# anything that has no namespace (and thus, no prefix) goes there.
return tag, tag, uri
raise ValueError(f'Namespace "{uri}" is not declared in scope') raise ValueError(f'Namespace "{uri}" is not declared in scope')
def data(self, data): def data(self, data):

2
Misc/NEWS.d/next/Library/2020-10-01-10-50-12.bpo-41900.Cho7oh.rst Normal file
View File

@ -0,0 +1,2 @@
C14N 2.0 serialisation in xml.etree.ElementTree failed for unprefixed attributes
when a default namespace was defined.