# HG changeset patch # User catherine@Elli.myhome.westell.com # Date 1238432168 14400 # Node ID 575652efb3d8903995d9294299c59227b04cbf40 # Parent 3db4166a54ce1ac9f70b19eb5c89f19ea21d2b9a aha - I think I know why comment-in-progress parse failing diff -r 3db4166a54ce -r 575652efb3d8 cmd2.py --- a/cmd2.py Mon Mar 30 08:27:35 2009 -0400 +++ b/cmd2.py Mon Mar 30 12:56:08 2009 -0400 @@ -29,7 +29,7 @@ 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 @@ 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 -r 3db4166a54ce -r 575652efb3d8 setup.py --- a/setup.py Mon Mar 30 08:27:35 2009 -0400 +++ b/setup.py Mon Mar 30 12:56:08 2009 -0400 @@ -3,7 +3,7 @@ setup( name="cmd2", - version="0.5.0", + version="0.5.1", py_modules=["cmd2",], # metadata for upload to PyPI