# HG changeset patch # User catherine@Elli.myhome.westell.com # Date 1232099013 18000 # Node ID 403e1c3ffc4ab4a7f4d0f7a9c248bbb0956d7d0e # Parent 1c21db096f49121da6d672f02bf3dfd99cc8e157 changed order for blankline parsing diff -r 1c21db096f49 -r 403e1c3ffc4a README.txt --- a/README.txt Thu Jan 15 19:38:07 2009 -0500 +++ b/README.txt Fri Jan 16 04:43:33 2009 -0500 @@ -129,13 +129,13 @@ Documented commands (type help ): ======================================== - _load edit history li load r save set shortcuts speak - ed hi l list orate run say shell show + _load edit history li load pause run say shell show + ed hi l list orate r save set shortcuts speak Undocumented commands: ====================== EOF cmdenvironment eof exit help q quit - + (Cmd) help say Repeats what you tell me to. Usage: speak [options] arg diff -r 1c21db096f49 -r 403e1c3ffc4a cmd2.py --- a/cmd2.py Thu Jan 15 19:38:07 2009 -0500 +++ b/cmd2.py Fri Jan 16 04:43:33 2009 -0500 @@ -399,9 +399,9 @@ self.parser = ( stringEnd | multilineParser | + blankLineTerminationParser | multilineCommand + pyparsing.SkipTo(stringEnd) | - singleLineParser | - blankLineTerminationParser + singleLineParser ) self.parser.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)