python-cmd2: cmd2.py comparison

comparison cmd2.py @ 133:31674148b13c

just beginning to make comments work

author	catherine@Elli.myhome.westell.com
date	Sat, 08 Nov 2008 17:10:20 -0500
parents	197a312f2656
children	c28ae4f75c15

comparison

equal deleted inserted replaced

-:197a312f2656
+:31674148b13c
 return result
 class Cmd(cmd.Cmd):
 echo = False
 caseInsensitive = True
-multilineCommands = []
+multilineCommands = ['_multiline_comment']
 continuationPrompt = '> '
-shortcuts = {'?': 'help', '!': 'shell', '@': 'load'}
+shortcuts = {'?': 'help', '!': 'shell', '@': 'load', '/*': '_multiline_comment', '#': '_comment'}
 excludeFromHistory = '''run r list l history hi ed edit li eof'''.split()
 noSpecialParse = 'set ed edit exit'.split()
 defaultExtension = 'txt'
 defaultFileName = 'command.txt'
 editor = os.environ.get('EDITOR')
 for editor in ['gedit', 'kate', 'vim', 'emacs', 'nano', 'pico']:
 if not os.system('which %s' % (editor)):
 break
 settable = ['prompt', 'continuationPrompt', 'defaultFileName', 'editor', 'caseInsensitive', 'echo']
-_TO_PASTE_BUFFER = 1
 def do_cmdenvironment(self, args):
 self.stdout.write("""
 Commands are %(casesensitive)scase-sensitive.
 Commands may be terminated with: %(terminators)s
 Settable parameters: %(settable)s
 def __init__(self, *args, **kwargs):
 cmd.Cmd.__init__(self, *args, **kwargs)
 self.history = History()
+def do__comment(self, arg):
+pass
+def do__multiline_comment(self, arg):
+pass
 def do_shortcuts(self, args):
 """Lists single-key shortcuts available."""
 result = "\n".join('%s: %s' % (sc[0], sc[1]) for sc in self.shortcuts.items())
 self.stdout.write("Single-key shortcuts for other commands:\n%s\n" % (result))
+specialTerminators = {'/*': pyparsing.Literal('*/')('terminator') }
 terminatorPattern = ((pyparsing.Literal(';') ^ pyparsing.Literal('\n\n'))
 ^ (pyparsing.Literal('\nEOF') + pyparsing.lineEnd))('terminator')
 argSeparatorPattern = pyparsing.Word(pyparsing.printables)('command') \
 + pyparsing.SkipTo(pyparsing.StringEnd())('args')
 filenamePattern = pyparsing.Word(pyparsing.alphanums + '#$-_~{},.!:\\/')
 integerPattern = pyparsing.Word(pyparsing.nums).setParseAction( lambda s,l,t: [ int(t[0]) ] )
 pipePattern = pyparsing.Literal('|')('pipe') + pyparsing.restOfLine('pipeTo')
 redirectOutPattern = (pyparsing.Literal('>>') ^ '>')('output') \
 + pyparsing.Optional(filenamePattern)('outputTo')
 redirectInPattern = pyparsing.Literal('<')('input') \
 + pyparsing.Optional(filenamePattern)('inputFrom')
 punctuationPattern = pipePattern ^ redirectInPattern ^ redirectOutPattern
 for p in (terminatorPattern, pipePattern, redirectInPattern, redirectOutPattern, punctuationPattern):
 p.ignore(pyparsing.sglQuotedString)
 p.ignore(pyparsing.dblQuotedString)
 '''if command in self.noSpecialParse:
 result['statement'] = result['upToIncluding'] = result['unterminated'] = result.fullStatement
 result['command'] = command
 result['args'] = ' '.join(result.fullStatement.split()[1:])
 return result'''
-if s[0] in self.shortcuts:
+for (shortcut, fullCommand) in self.shortcuts.items():
-s = self.shortcuts[s[0]] + ' ' + s[1:]
+if s.startswith(shortcut):
+s = s.replace(shortcut, fullCommand + ' ', 1)
+break
 result['statement'] = s
 result['parseable'] = s
-result += parseSearchResults(self.terminatorPattern, s)
+terminator = self.specialTerminators.get(command) or self.terminatorPattern
+result += parseSearchResults(terminator, s)
 if result.terminator:
 result['statement'] = result.upToIncluding
 result['unterminated'] = result.before
 result['parseable'] = result.after
 else:
 else:
 statekeeper = Statekeeper(self, ('stdout',))
 self.stdout = tempfile.TemporaryFile()
 if statement.output == '>>':
 self.stdout.write(getPasteBuffer())
-stop = cmd.Cmd.onecmd(self, statement.statement)
+try:
+stop = cmd.Cmd.onecmd(self, statement.statement)
+except Exception, e:
+print e
 try:
 if statement.command not in self.excludeFromHistory:
 self.history.append(statement.fullStatement)
 finally:
 if statekeeper:
 def do_EOF(self, arg):
 return True
 do_eof = do_EOF
-def clean(self, s):
-"""cleans up a string"""
-if self.caseInsensitive:
-return s.strip().lower()
-return s.strip()
 def showParam(self, param):
-param = self.clean(param)
+param = param.strip().lower()
 if param in self.settable:
 val = getattr(self, param)
 self.stdout.write('%s: %s\n' % (param, str(getattr(self, param))))
 def do_quit(self, arg):
 def do_set(self, arg):
 'Sets a parameter'
 try:
 paramName, val = arg.split(None, 1)
-paramName = self.clean(paramName)
+paramName = paramName.strip().lower()
 if paramName not in self.settable:
 raise NotSettableError
 currentVal = getattr(self, paramName)
 if (val[0] == val[-1]) and val[0] in ("'", '"'):
 val = val[1:-1]
 try:
 if arg:
 return self.history.get(arg)[-1]
 else:
 return self.history[-1]
-except:
+except IndexError:
 return None
 def do_list(self, arg):
 """list [arg]: lists last command issued
 no arg -> list absolute last
 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
-buffer = ''
+if arg:
 try:
-arg = int(arg)
+buffer = self.last_matching(int(arg))
-buffer = self.last_matching(arg)
+except ValueError:
-except:
-if arg:
 filename = arg
-else:
+buffer = ''
-buffer = self.last_matching(arg)
+else:
+buffer = self.history[-1]
 if buffer:
 f = open(filename, 'w')
 f.write(buffer or '')
 f.close()

Mercurial > python-cmd2

comparison cmd2.py @ 133:31674148b13c