diff options
| author | Miss Skeleton (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-10-02 23:41:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-03 08:41:35 +0200 |
| commit | a0f2b664335eb689abdecc677e09a193f503af59 (patch) | |
| tree | a8778c488830bc68830a489395d9cbfa80c16526 | |
| parent | ebc8072c3dbcee983db4c709095426b4dc6d0516 (diff) | |
| download | cpython-git-a0f2b664335eb689abdecc677e09a193f503af59.tar.gz | |
bpo-41900: C14N 2.0 serialisation failed for unprefixed attributes when a default namespace was defined. (GH-22474) (GH-22507)
(cherry picked from commit 6a412c94b6b68e7e3632562dc7358a12ffd1447f)
| -rw-r--r-- | Lib/test/test_xml_etree.py | 8 | ||||
| -rw-r--r-- | Lib/xml/etree/ElementTree.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-10-01-10-50-12.bpo-41900.Cho7oh.rst | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index d01649d1c3..5632b8b503 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -3894,6 +3894,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>"), #'<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): xml = textwrap.dedent("""\ <root xmlns:x="http://example.com/x"> diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py index da2bcad0b4..7a269001d6 100644 --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -1876,6 +1876,11 @@ class C14NWriterTarget: self._declared_ns_stack[-1].append((uri, prefix)) 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') def data(self, data): diff --git a/Misc/NEWS.d/next/Library/2020-10-01-10-50-12.bpo-41900.Cho7oh.rst b/Misc/NEWS.d/next/Library/2020-10-01-10-50-12.bpo-41900.Cho7oh.rst new file mode 100644 index 0000000000..6586c09ec9 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-10-01-10-50-12.bpo-41900.Cho7oh.rst @@ -0,0 +1,2 @@ +C14N 2.0 serialisation in xml.etree.ElementTree failed for unprefixed attributes +when a default namespace was defined. |