From 3c5a858ec6a4e5851903762770fe526a46d3c351 Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Sun, 14 Apr 2019 21:12:34 +0200 Subject: [PATCH] bpo-30485: Re-allow empty strings in ElementPath namespace mappings since they might actually be harmless and unused (and thus went undetected previously). (#12830) --- Lib/test/test_xml_etree.py | 3 --- Lib/xml/etree/ElementPath.py | 2 -- 2 files changed, 5 deletions(-) diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 2f7a3b60b22..f5b118b079e 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -2466,9 +2466,6 @@ def test_findall_different_nsmaps(self): nsmap = {'xx': 'X', None: 'Y'} self.assertEqual(len(root.findall(".//xx:b", namespaces=nsmap)), 2) self.assertEqual(len(root.findall(".//b", namespaces=nsmap)), 1) - nsmap = {'xx': 'X', '': 'Y'} - with self.assertRaisesRegex(ValueError, 'namespace prefix'): - root.findall(".//xx:b", namespaces=nsmap) def test_bad_find(self): e = ET.XML(SAMPLE_XML) diff --git a/Lib/xml/etree/ElementPath.py b/Lib/xml/etree/ElementPath.py index 0e3854f9db2..4d231a7df65 100644 --- a/Lib/xml/etree/ElementPath.py +++ b/Lib/xml/etree/ElementPath.py @@ -275,8 +275,6 @@ def iterfind(elem, path, namespaces=None): cache_key = (path,) if namespaces: - if '' in namespaces: - raise ValueError("empty namespace prefix must be passed as None, not the empty string") if None in namespaces: cache_key += (namespaces[None],) + tuple(sorted( item for item in namespaces.items() if item[0] is not None))