languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-22 05:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #17011: Fix caching of xpath path when namespaces are present.

Browse source 
Thanks to Stefan Behnel for the report and proposed solution & test.
This commit is contained in:
Eli Bendersky 2013-08-03 17:47:47 -07:00
parent 3ceaff0777
commit 2acc525a97
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_xml_etree.py
View file

@ -1679,6 +1679,20 @@ def test_test_find_with_ns(self):
summarize_list(e.findall(".//{http://effbot.org/ns}tag")),
['{http://effbot.org/ns}tag'] * 3)
def test_findall_different_nsmaps(self):
root = ET.XML('''
<a xmlns:x="X" xmlns:y="Y">
<x:b><c/></x:b>
<b/>
<c><x:b/><b/></c><y:b/>
</a>''')
nsmap = {'xx': 'X'}
self.assertEqual(len(root.findall(".//xx:b", namespaces=nsmap)), 2)
self.assertEqual(len(root.findall(".//b", namespaces=nsmap)), 2)
nsmap = {'xx': 'Y'}
self.assertEqual(len(root.findall(".//xx:b", namespaces=nsmap)), 1)
self.assertEqual(len(root.findall(".//b", namespaces=nsmap)), 2)
def test_bad_find(self):
e = ET.XML(SAMPLE_XML)
with self.assertRaisesRegex(SyntaxError, 'cannot use absolute path'):

6
Lib/xml/etree/ElementPath.py
View file

@ -246,10 +246,12 @@ def __init__(self, root):
def iterfind(elem, path, namespaces=None):
# compile selector pattern
cache_key = (path, None if namespaces is None
else tuple(sorted(namespaces.items())))
if path[-1:] == "/":
path = path + "*" # implicit all (FIXME: keep this?)
try:
selector = _cache[path]
selector = _cache[cache_key]
except KeyError:
if len(_cache) > 100:
_cache.clear()
@ -269,7 +271,7 @@ def iterfind(elem, path, namespaces=None):
token = next()
except StopIteration:
break
_cache[path] = selector
_cache[cache_key] = selector
# execute selector pattern
result = [elem]
context = _SelectorContext(elem)