# HG changeset patch # User Andreas Nolda # Date 1662372930 -7200 # Mon Sep 05 12:15:30 2022 +0200 # Node ID 9678f86d3f6f3c452f8b5c74677d9deb1a42b2f7 # Parent 49d29f80f5855b72ede7a55b1489950c73707f1a add default namespaces also in XPath expressions containing "and" or "or" diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,8 @@ +2022-09-05: + +* add default namespaces also in XPath expressions containing `and` or `or` +* bump version to 2.11 + 2022-05-11: * add options `-p` (`--pis`) and `-P` (`--comments`) diff --git a/xgrep.py b/xgrep.py --- a/xgrep.py +++ b/xgrep.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 # xgrep.py -- search for elements in XML files, using XPath 1.0 expressions -# Andreas Nolda 2022-05-11 +# Andreas Nolda 2022-09-05 import sys import argparse @@ -8,7 +8,7 @@ from blessings import Terminal from lxml import etree -version = "2.10" +version = "2.11" parser = argparse.ArgumentParser() parser.add_argument("expr", @@ -65,6 +65,8 @@ "[a-z-]+\(|" # function( ",|" # , "\)|" # ) + "\s+and\s+|" # and + "\s+or\s+|" # or "\]" # ] ")", expr)