summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorptmcg <ptmcg@9bf210a0-9d2d-494c-87cf-cfb32e7dff7b>2017-02-28 04:40:51 +0000
committerptmcg <ptmcg@9bf210a0-9d2d-494c-87cf-cfb32e7dff7b>2017-02-28 04:40:51 +0000
commit98f101092074ae15ab7f1e579c6bde04c4eec278 (patch)
tree47ad3d1940bb5c66708806dfd824ded3512a3051
parent312114265fc490b078771aa19351d3b9cd378f4c (diff)
downloadpyparsing-98f101092074ae15ab7f1e579c6bde04c4eec278.tar.gz
Minor change when using '-' operator, to be compatible with ParserElement.streamline() method.
git-svn-id: svn://svn.code.sf.net/p/pyparsing/code/trunk@454 9bf210a0-9d2d-494c-87cf-cfb32e7dff7b
-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 ):
"""