summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatherine Devlin <catherine.devlin@gmail.com>2009-03-30 12:56:08 -0400
committerCatherine Devlin <catherine.devlin@gmail.com>2009-03-30 12:56:08 -0400
commit829d848086bd5ea57a6bc5283d34c7fce96cdcce (patch)
treec975b0ae9067736a639859ccde9c0f2d9d4d41b6
parent3acbc272383795c6ebc676b6aa8b7da3e6073d40 (diff)
downloadcmd2-git-829d848086bd5ea57a6bc5283d34c7fce96cdcce.tar.gz
aha - I think I know why comment-in-progress parse failing
-rwxr-xr-xcmd2.py8
-rwxr-xr-xsetup.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/cmd2.py b/cmd2.py
index 8a0689b8..b46c9439 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -29,7 +29,7 @@ import cmd, re, os, sys, optparse, subprocess, tempfile, pyparsing, doctest
import unittest, string, datetime, urllib
from code import InteractiveConsole, InteractiveInterpreter, softspace
from optparse import make_option
-__version__ = '0.5.0'
+__version__ = '0.5.1'
class OptionParser(optparse.OptionParser):
def exit(self, status=0, msg=None):
@@ -506,9 +506,9 @@ class Cmd(cmd.Cmd):
pyparsing.SkipTo(outputParser ^ pipe ^ stringEnd).setParseAction(lambda x: x[0].strip())('suffix') + afterElements)
self.singleLineParser = ((oneLineCommand + pyparsing.SkipTo(terminatorParser ^ stringEnd ^ pipe ^ outputParser).setParseAction(lambda x:x[0].strip())('args'))('statement') +
pyparsing.Optional(terminatorParser) + afterElements)
- #self.multilineParser = self.multilineParser.setResultsName('multilineParser')
- #self.singleLineParser = self.singleLineParser.setResultsName('singleLineParser')
- #self.blankLineTerminationParser = self.blankLineTerminationParser.setResultsName('blankLineTerminatorParser')
+ self.multilineParser = self.multilineParser.setResultsName('multilineParser')
+ self.singleLineParser = self.singleLineParser.setResultsName('singleLineParser')
+ self.blankLineTerminationParser = self.blankLineTerminationParser.setResultsName('blankLineTerminatorParser')
self.parser = (
stringEnd |
self.prefixParser + self.multilineParser |
diff --git a/setup.py b/setup.py
index 5670821d..d1deebf3 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
setup(
name="cmd2",
- version="0.5.0",
+ version="0.5.1",
py_modules=["cmd2",],
# metadata for upload to PyPI