summaryrefslogtreecommitdiff
path: root/src/pyparsing.py
diff options
context:
space:
mode:
authorPaul McGuire <ptmcg@austin.rr.com>2017-02-28 04:40:51 +0000
committerPaul McGuire <ptmcg@austin.rr.com>2017-02-28 04:40:51 +0000
commitaad0144955406d5c613e451c43b6251cf58f88e7 (patch)
tree47ad3d1940bb5c66708806dfd824ded3512a3051 /src/pyparsing.py
parentad7073f32879778ca769cdc014aff04281d22c07 (diff)
downloadpyparsing-git-aad0144955406d5c613e451c43b6251cf58f88e7.tar.gz
Minor change when using '-' operator, to be compatible with ParserElement.streamline() method.
Diffstat (limited to 'src/pyparsing.py')
-rw-r--r--src/pyparsing.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pyparsing.py b/src/pyparsing.py
index 576ddf6..8a02b63 100644
--- a/src/pyparsing.py
+++ b/src/pyparsing.py
@@ -1834,7 +1834,7 @@ class ParserElement(object):
warnings.warn("Cannot combine element of type %s with ParserElement" % type(other),
SyntaxWarning, stacklevel=2)
return None
- return And( [ self, And._ErrorStop(), other ] )
+ return self + And._ErrorStop() + other
def __rsub__(self, other ):
"""