bpo-40624: Add support for the XPath != operator in xml.etree (GH-22147)
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index 3f1f378..fd4a385 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -2852,8 +2852,12 @@ def test_findall(self):
['tag'] * 3)
self.assertEqual(summarize_list(e.findall('.//tag[@class="a"]')),
['tag'])
+ self.assertEqual(summarize_list(e.findall('.//tag[@class!="a"]')),
+ ['tag'] * 2)
self.assertEqual(summarize_list(e.findall('.//tag[@class="b"]')),
['tag'] * 2)
+ self.assertEqual(summarize_list(e.findall('.//tag[@class!="b"]')),
+ ['tag'])
self.assertEqual(summarize_list(e.findall('.//tag[@id]')),
['tag'])
self.assertEqual(summarize_list(e.findall('.//section[tag]')),
@@ -2875,6 +2879,19 @@ def test_findall(self):
self.assertEqual(summarize_list(e.findall(".//section[ tag = 'subtext' ]")),
['section'])
+ # Negations of above tests. They match nothing because the sole section
+ # tag has subtext.
+ self.assertEqual(summarize_list(e.findall(".//section[tag!='subtext']")),
+ [])
+ self.assertEqual(summarize_list(e.findall(".//section[tag !='subtext']")),
+ [])
+ self.assertEqual(summarize_list(e.findall(".//section[tag!= 'subtext']")),
+ [])
+ self.assertEqual(summarize_list(e.findall(".//section[tag != 'subtext']")),
+ [])
+ self.assertEqual(summarize_list(e.findall(".//section[ tag != 'subtext' ]")),
+ [])
+
self.assertEqual(summarize_list(e.findall(".//tag[.='subtext']")),
['tag'])
self.assertEqual(summarize_list(e.findall(".//tag[. ='subtext']")),
@@ -2890,6 +2907,24 @@ def test_findall(self):
self.assertEqual(summarize_list(e.findall(".//tag[.= ' subtext']")),
[])
+ # Negations of above tests.
+ # Matches everything but the tag containing subtext
+ self.assertEqual(summarize_list(e.findall(".//tag[.!='subtext']")),
+ ['tag'] * 3)
+ self.assertEqual(summarize_list(e.findall(".//tag[. !='subtext']")),
+ ['tag'] * 3)
+ self.assertEqual(summarize_list(e.findall('.//tag[.!= "subtext"]')),
+ ['tag'] * 3)
+ self.assertEqual(summarize_list(e.findall('.//tag[ . != "subtext" ]')),
+ ['tag'] * 3)
+ self.assertEqual(summarize_list(e.findall(".//tag[. != 'subtext']")),
+ ['tag'] * 3)
+ # Matches all tags.
+ self.assertEqual(summarize_list(e.findall(".//tag[. != 'subtext ']")),
+ ['tag'] * 4)
+ self.assertEqual(summarize_list(e.findall(".//tag[.!= ' subtext']")),
+ ['tag'] * 4)
+
# duplicate section => 2x tag matches
e[1] = e[2]
self.assertEqual(summarize_list(e.findall(".//section[tag = 'subtext']")),
diff --git a/Lib/xml/etree/ElementPath.py b/Lib/xml/etree/ElementPath.py
index d318e65..1cbd839 100644
--- a/Lib/xml/etree/ElementPath.py
+++ b/Lib/xml/etree/ElementPath.py
@@ -65,8 +65,9 @@
r"//?|"
r"\.\.|"
r"\(\)|"
+ r"!=|"
r"[/.*:\[\]\(\)@=])|"
- r"((?:\{[^}]+\})?[^/\[\]\(\)@=\s]+)|"
+ r"((?:\{[^}]+\})?[^/\[\]\(\)@!=\s]+)|"
r"\s+"
)
@@ -253,15 +254,19 @@ def select(context, result):
if elem.get(key) is not None:
yield elem
return select
- if signature == "@-='":
- # [@attribute='value']
+ if signature == "@-='" or signature == "@-!='":
+ # [@attribute='value'] or [@attribute!='value']
key = predicate[1]
value = predicate[-1]
def select(context, result):
for elem in result:
if elem.get(key) == value:
yield elem
- return select
+ def select_negated(context, result):
+ for elem in result:
+ if (attr_value := elem.get(key)) is not None and attr_value != value:
+ yield elem
+ return select_negated if '!=' in signature else select
if signature == "-" and not re.match(r"\-?\d+$", predicate[0]):
# [tag]
tag = predicate[0]
@@ -270,8 +275,10 @@ def select(context, result):
if elem.find(tag) is not None:
yield elem
return select
- if signature == ".='" or (signature == "-='" and not re.match(r"\-?\d+$", predicate[0])):
- # [.='value'] or [tag='value']
+ if signature == ".='" or signature == ".!='" or (
+ (signature == "-='" or signature == "-!='")
+ and not re.match(r"\-?\d+$", predicate[0])):
+ # [.='value'] or [tag='value'] or [.!='value'] or [tag!='value']
tag = predicate[0]
value = predicate[-1]
if tag:
@@ -281,12 +288,22 @@ def select(context, result):
if "".join(e.itertext()) == value:
yield elem
break
+ def select_negated(context, result):
+ for elem in result:
+ for e in elem.iterfind(tag):
+ if "".join(e.itertext()) != value:
+ yield elem
+ break
else:
def select(context, result):
for elem in result:
if "".join(elem.itertext()) == value:
yield elem
- return select
+ def select_negated(context, result):
+ for elem in result:
+ if "".join(elem.itertext()) != value:
+ yield elem
+ return select_negated if '!=' in signature else select
if signature == "-" or signature == "-()" or signature == "-()-":
# [index] or [last()] or [last()-index]
if signature == "-":