diff options
author | Paul McGuire <ptmcg@austin.rr.com> | 2019-04-07 07:42:20 -0500 |
---|---|---|
committer | Paul McGuire <ptmcg@austin.rr.com> | 2019-04-07 07:42:20 -0500 |
commit | 76b3af7f25d0f25d4eb7f0849a23e22b5b2a0297 (patch) | |
tree | 53ae14557c3bbbe7545983ee7414f442f2fe4d07 /pyparsing.py | |
parent | a2439508ba5c94546db98593cfa676de9b59babe (diff) | |
download | pyparsing-git-76b3af7f25d0f25d4eb7f0849a23e22b5b2a0297.tar.gz |
Improved support for "python setup.py test"
Diffstat (limited to 'pyparsing.py')
-rw-r--r-- | pyparsing.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pyparsing.py b/pyparsing.py index 97f3374..093d346 100644 --- a/pyparsing.py +++ b/pyparsing.py @@ -94,7 +94,7 @@ classes inherit from. Use the docstrings for examples of how to: """ __version__ = "2.4.0" -__versionTime__ = "07 Apr 2019 04:08 UTC" +__versionTime__ = "07 Apr 2019 12:40 UTC" __author__ = "Paul McGuire <ptmcg@users.sourceforge.net>" import string @@ -160,7 +160,7 @@ __compat__.collect_all_And_tokens = True #~ sys.stderr.write( "testing pyparsing module, version %s, %s\n" % (__version__,__versionTime__ ) ) -__all__ = [ +__all__ = [ '__version__', '__versionTime__', '__author__', '__compat__', 'And', 'CaselessKeyword', 'CaselessLiteral', 'CharsNotIn', 'Combine', 'Dict', 'Each', 'Empty', 'FollowedBy', 'Forward', 'GoToColumn', 'Group', 'Keyword', 'LineEnd', 'LineStart', 'Literal', 'PrecededBy', 'MatchFirst', 'NoMatch', 'NotAny', 'OneOrMore', 'OnlyOnce', 'Optional', 'Or', @@ -5215,7 +5215,7 @@ def ungroup(expr): """Helper to undo pyparsing's default grouping of And expressions, even if all but one are non-empty. """ - return TokenConverter(expr).setParseAction(lambda t:t[0]) + return TokenConverter(expr).addParseAction(lambda t:t[0]) def locatedExpr(expr): """Helper to decorate a returned token with its starting and ending |