python-cmd2: cmd2.py comparison

comparison cmd2.py @ 207:a3bec7704e65

tweaking

author	catherine@dellzilla
date	Wed, 04 Mar 2009 17:44:57 -0500
parents	00eaec841567
children	f10bd1f0c7e3

comparison

equal deleted inserted replaced

-:00eaec841567
+:a3bec7704e65
 result = getPasteBuffer()
 return result
 class Cmd(cmd.Cmd):
 echo = False
-caseInsensitive = True
+case_insensitive = True
-continuationprompt = '> '
+continuation_prompt = '> '
 timing = False
 legalChars = '!#$%.:?@_' + pyparsing.alphanums + pyparsing.alphas8bit  # make sure your terminators are not in here!
 shortcuts = {'?': 'help', '!': 'shell', '@': 'load' }
 excludeFromHistory = '''run r list l history hi ed edit li eof'''.split()
 noSpecialParse = 'set ed edit exit'.split()
 defaultExtension = 'txt'
-defaultFileName = 'command.txt'
+default_file_name = 'command.txt'
-settable = ['prompt', 'continuationprompt', 'defaultFileName', 'editor', 'caseInsensitive',
+settable = ['prompt', 'continuation_prompt', 'default_file_name', 'editor', 'case_insensitive',
 'echo', 'timing']
 settable.sort()
 editor = os.environ.get('EDITOR')
 _STOP_AND_EXIT = 2
 self.stdout.write("""
 Commands are %(casesensitive)scase-sensitive.
 Commands may be terminated with: %(terminators)s
 Settable parameters: %(settable)s
 """ %
-{ 'casesensitive': (self.caseInsensitive and 'not ') or '',
+{ 'casesensitive': (self.case_insensitive and 'not ') or '',
 'terminators': str(self.terminators),
 'settable': ' '.join(self.settable)
 })
 def do_help(self, arg):
 def _init_parser(self):
 r'''
 >>> c = Cmd()
 >>> c.multilineCommands = ['multiline']
->>> c.caseInsensitive = True
+>>> c.case_insensitive = True
 >>> c._init_parser()
 >>> print c.parser.parseString('').dump()
 []
 >>> print c.parser.parseString('/* empty command */').dump()
 []
 '''
 outputParser = (pyparsing.Literal('>>') | (pyparsing.WordStart() + '>') | pyparsing.Regex('[^=]>'))('output')
 terminatorParser = pyparsing.Or([(hasattr(t, 'parseString') and t) or pyparsing.Literal(t) for t in self.terminators])('terminator')
 stringEnd = pyparsing.stringEnd ^ '\nEOF'
-self.multilineCommand = pyparsing.Or([pyparsing.Keyword(c, caseless=self.caseInsensitive) for c in self.multilineCommands])('multilineCommand')
+self.multilineCommand = pyparsing.Or([pyparsing.Keyword(c, caseless=self.case_insensitive) for c in self.multilineCommands])('multilineCommand')
 oneLineCommand = (~self.multilineCommand + pyparsing.Word(self.legalChars))('command')
 pipe = pyparsing.Keyword('|', identChars='|')
 self.commentGrammars.ignore(pyparsing.quotedString).setParseAction(lambda x: '')
 self.commentInProgress.ignore(pyparsing.quotedString).ignore(pyparsing.cStyleComment)
 afterElements = \
 pyparsing.Optional(pipe + pyparsing.SkipTo(outputParser ^ stringEnd)('pipeTo')) + \
 pyparsing.Optional(outputParser + pyparsing.SkipTo(stringEnd).setParseAction(lambda x: x[0].strip())('outputTo'))
-if self.caseInsensitive:
+if self.case_insensitive:
 self.multilineCommand.setParseAction(lambda x: x[0].lower())
 oneLineCommand.setParseAction(lambda x: x[0].lower())
 if self.blankLinesAllowed:
 self.blankLineTerminationParser = pyparsing.NoMatch
 else:
 return 0    # command was empty except for comments
 try:
 statement = self.parsed(line)
 while statement.parsed.multilineCommand and (statement.parsed.terminator == ''):
 statement = '%s\n%s' % (statement.parsed.raw,
-self.pseudo_raw_input(self.continuationprompt))
+self.pseudo_raw_input(self.continuation_prompt))
 statement = self.parsed(statement)
 except Exception, e:
 print e
 return 0
 "set edit (program-name)" or set  EDITOR environment variable
 to control which editing program is used."""
 if not self.editor:
 print "please use 'set editor' to specify your text editing program of choice."
 return
-filename = self.defaultFileName
+filename = self.default_file_name
 if arg:
 try:
 buffer = self.last_matching(int(arg))
 except ValueError:
 filename = arg
 try:
 args = self.saveparser.parseString(arg)
 except pyparsing.ParseException:
 print self.do_save.__doc__
 return
-fname = args.fname or self.defaultFileName
+fname = args.fname or self.default_file_name
 if args.idx == '*':
 saveme = '\n\n'.join(self.history[:])
 elif args.idx:
 saveme = self.history[int(args.idx)-1]
 else:
 print 'Error saving %s: %s' % (fname, str(e))
 def do_load(self, fname=None):
 """Runs command(s) from a file."""
 if fname is None:
-fname = self.defaultFileName
+fname = self.default_file_name
 fname = os.path.expanduser(fname)
-keepstate = Statekeeper(self, ('stdin','use_rawinput','prompt','continuationprompt'))
+keepstate = Statekeeper(self, ('stdin','use_rawinput','prompt','continuation_prompt'))
 if isinstance(fname, file):
 self.stdin = fname
 else:
 try:
 self.stdin = open(os.path.expanduser(fname), 'r')
 except IOError:
 print 'Problem opening file %s: \n%s' % (fname, e)
 keepstate.restore()
 return
 self.use_rawinput = False
-self.prompt = self.continuationprompt = ''
+self.prompt = self.continuation_prompt = ''
 stop = self.cmdloop()
 self.stdin.close()
 keepstate.restore()
 self.lastcmd = ''
 return (stop == self._STOP_AND_EXIT) and self._STOP_AND_EXIT
 while True:
 while not line.startswith(self.cmdapp.prompt):
 line = self.transcript.next()
 command = [line[len(self.cmdapp.prompt):]]
 line = self.transcript.next()
-while line.startswith(self.cmdapp.continuationprompt):
+while line.startswith(self.cmdapp.continuation_prompt):
-command.append(line[len(self.cmdapp.continuationprompt):])
+command.append(line[len(self.cmdapp.continuation_prompt):])
 line = self.transcript.next()
 command = ''.join(command)
 self.cmdapp.onecmd(command)
 result = self.outputTrap.read()
 if line.startswith(self.cmdapp.prompt):

Mercurial > python-cmd2

comparison cmd2.py @ 207:a3bec7704e65