summaryrefslogtreecommitdiffstats
path: root/Lib/xml
diff options
context:
space:
mode:
authorEli Bendersky <eliben@gmail.com>2013-08-04 00:47:47 (GMT)
committerEli Bendersky <eliben@gmail.com>2013-08-04 00:47:47 (GMT)
commit2acc525a972b2b6b071eb5b9596ed1390d6d98e0 (patch)
tree84b50e968dab06dba7229eef4046f286c56cd53e /Lib/xml
parent3ceaff0777059c770836e817160f6a81b60c7b18 (diff)
downloadcpython-2acc525a972b2b6b071eb5b9596ed1390d6d98e0.zip
cpython-2acc525a972b2b6b071eb5b9596ed1390d6d98e0.tar.gz
cpython-2acc525a972b2b6b071eb5b9596ed1390d6d98e0.tar.bz2
Issue #17011: Fix caching of xpath path when namespaces are present.
Thanks to Stefan Behnel for the report and proposed solution & test.
Diffstat (limited to 'Lib/xml')
-rw-r--r--Lib/xml/etree/ElementPath.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/xml/etree/ElementPath.py b/Lib/xml/etree/ElementPath.py
index 52e65f0..e7015c7 100644
--- a/Lib/xml/etree/ElementPath.py
+++ b/Lib/xml/etree/ElementPath.py
@@ -246,10 +246,12 @@ class _SelectorContext:
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)