summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorptmcg <ptmcg@9bf210a0-9d2d-494c-87cf-cfb32e7dff7b>2008-11-08 12:02:12 +0000
committerptmcg <ptmcg@9bf210a0-9d2d-494c-87cf-cfb32e7dff7b>2008-11-08 12:02:12 +0000
commit4c1ee71a7fb25aaf278208b309be070fa93a1f60 (patch)
tree0ab5c24fab50a834a894359ab866705b3683724f
parent389c5a203a3aab09b35bae1ddf5a83012d0294c5 (diff)
downloadpyparsing-4c1ee71a7fb25aaf278208b309be070fa93a1f60.tar.gz
Added support for generator expressions when manually creating And, Or, MatchFirst, or Each objects
git-svn-id: svn://svn.code.sf.net/p/pyparsing/code/src@172 9bf210a0-9d2d-494c-87cf-cfb32e7dff7b
-rw-r--r--pyparsing.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyparsing.py b/pyparsing.py
index baa432a..2c91688 100644
--- a/pyparsing.py
+++ b/pyparsing.py
@@ -59,7 +59,7 @@ The pyparsing module handles some of the problems that are typically vexing when
"""
__version__ = "1.5.2"
-__versionTime__ = "7 November 2008 11:15"
+__versionTime__ = "8 November 2008 05:36"
__author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
import string
@@ -2206,7 +2206,7 @@ class ParseExpression(ParserElement):
elif isinstance( exprs, basestring ):
self.exprs = [ Literal( exprs ) ]
else:
- self.exprs = [ exprs ]
+ self.exprs = list( exprs )
self.callPreparse = False
def __getitem__( self, i ):