# HG changeset patch # User catherine@Drou # Date 1267504015 18000 # Node ID 2687482dfa33dc81fe4a9eb8d3d1cb5151111d5b # Parent 04897151927b2353b70464c9b510efd1f84e6abc doubledashcomment moved into sqlpyPlus to define parser after local comment definition diff -r 04897151927b -r 2687482dfa33 cmd2.py --- a/cmd2.py Mon Mar 01 06:57:10 2010 -0500 +++ b/cmd2.py Mon Mar 01 23:26:55 2010 -0500 @@ -471,15 +471,11 @@ cmd.Cmd.__init__(self, *args, **kwargs) self.initial_stdout = sys.stdout self.history = History() - self._init_parser() self.pystate = {} self.shortcuts = sorted(self.shortcuts.items(), reverse=True) self.keywords = self.reserved_words + [fname[3:] for fname in dir(self) - if fname.startswith('do_')] - def linelist(arg): - result = [] - - self.doubleDashComment = pyparsing.NotAny(pyparsing.Or(options_defined)) + pyparsing.Literal('--') + pyparsing.restOfLine + if fname.startswith('do_')] + self._init_parser() def do_shortcuts(self, args): """Lists single-key shortcuts available."""