python-cmd2: cmd2.py comparison

comparison cmd2.py @ 76:dcd5d13e5603

fixed problem with interpreting terminators

author	catherine@Elli.myhome.westell.com
date	Sat, 28 Jun 2008 10:31:12 -0400
parents	8b2603d1acc1
children	bb44928c3856

comparison

equal deleted inserted replaced

-:8b2603d1acc1
+:dcd5d13e5603
 def getPasteBuffer():
 raise OSError, pastebufferr % ('xclip', 'On Debian/Ubuntu, install with "sudo apt-get install xclip"')
 setPasteBuffer = getPasteBuffer
 pyparsing.ParserElement.setDefaultWhitespaceChars(' \t')    # see http://pyparsing.wikispaces.com/message/view/home/1352689
+class Arguments(str):
+def __new__(cls, s, parent):
+result = str.__new__(cls, s)
+result.parent = parent
+return result
 class UserCommand(str):
 def __new__(cls, s, app):
 return str.__new__(cls, s)
 def __init__(self, s, app):
 self.terminator = None
 self.terminator_suffix = None
+s = s.strip()
+shortcut = app.shortcuts.get(s[0])
+if shortcut and hasattr(app, 'do_%s' % shortcut):
+s = '%s %s' % (shortcut, s[1:])
 self.searchable = self.asEntered = s
 self.app = app
 self.output_destination_pattern = self.punctuationPattern(['>>', '>'])
 self.input_source_pattern = self.punctuationPattern(['<'])
 self.pipe_destination_pattern = self.punctuationPattern(['|'])
 processed = reduce(lambda x, y: x ^ y, processed)
 processed.ignore(pyparsing.sglQuotedString)
 processed.ignore(pyparsing.dblQuotedString)
 pattern = pyparsing.SkipTo(processed) + processed + pyparsing.restOfLine
 return pattern
-def find_punctuation(self):
+def parse(self):
 punctuators = ['|','>','>>','<']
 punctuators.extend(self.app.terminators)
 punctuated = self.punctuationPattern(punctuators).searchString(self.asEntered)
 if punctuated:
 self.executable, self.searchable = punctuated[0][0], self.asEntered[len(punctuated[0][0]):]
 else:
 self.executable, self.searchable = self.asEntered, ''
+self.executable = self.executable.strip()
+try:
+self.cmd, self.arg = (pyparsing.Word(self.app.identchars)+pyparsing.restOfLine).parseString(self.executable)
+self.arg = Arguments(self.arg, self)
+except pyparsing.ParseException:
+self.cmd, self.arg = None, None
 def complete(self):
 terminator_finder = self.punctuationPattern(self.app.terminators)
 result = terminator_finder.searchString(self.asEntered)
 while not result:
 inp = self.app.pseudo_raw_input(self.app.continuationPrompt)
 self.asEntered = '%s\n%s' % (self.asEntered, inp)
 result = terminator_finder.searchString(self.asEntered)
-try:
+self.terminator = result[0][1]
-self.terminator = result[0][1][0]
+if len(result[0]) > 3:
-self.terminator_suffix = result[0][1][1]
+self.terminator_suffix = result[0][2]
-except IndexError:
+else:
-self.terminator = result[0][1]
 self.terminator_suffix = None
 def redirectedInput(self):
 inputFrom = self.input_source_pattern.searchString(self.searchable)
 if inputFrom:
 if inputFrom[0][-1].strip():
 mode = 'a'
 else:
 mode = 'w'
 return dest, mode
 return None, None
-"""
-Produces a string parser based on a list of targets to search for.
-Output is a parser function.
-Parser's output is a tuple: (before the target, [elements of the target], after the target)
->>> p = punctuationParser([';', 'EOF'])
->>> p('is terminated;')
-('is terminated', [';'], '')
->>> p('is terminated EOF after the end')
-('is terminated', ['EOF'], 'after the end')
->>> p('is not terminated')
->>> pattern1 = pyparsing.Literal(';') + pyparsing.Optional(pyparsing.Word(pyparsing.nums))
->>> p2 = punctuationParser([pattern1, 'EOF'])
->>> p2('the quick brown fox;4')
-('the quick brown fox', [';', '4'], '')
->>> p2('the quick brown foxEOF')
-('the quick brown fox', ['EOF'], '')
->>> p2('nothing')
-"""
 class Cmd(cmd.Cmd):
 caseInsensitive = True
 multilineCommands = []          # commands that need a terminator to be finished
 terminators = [';', pyparsing.LineEnd() + pyparsing.LineEnd()]
 command, args = self.extractCommand(line)
 originalStatement = ' '.join([command, args])
 statement = UserCommand(originalStatement, self)
 if (not assumeComplete) and (command in self.multilineCommands):
 statement.complete()
-statement.find_punctuation()
+statement.parse()
 statement.redirectedInput()
 pipeTo = statement.pipeDestination()
 if pipeTo:
 statekeeper = Statekeeper(self, ('stdout',))
 dest = subprocess.Popen(pipeTo, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
 else:
 self.stdout = tempfile.TemporaryFile()
 if outputMode == 'a':
 self.stdout.write(getPasteBuffer())
-stop = cmd.Cmd.onecmd(self, statement.executable)
+stop = cmd.Cmd.onecmd(self, statement)
 try:
 if command not in self.excludeFromHistory:
 self.history.append(originalStatement)
 finally:
 if statekeeper:
 def parseline(self, line):
 """Parse the line into a command name and a string containing
 the arguments.  Returns a tuple containing (command, args, line).
 'command' and 'args' may be None if the line couldn't be parsed.
 """
-line = line.strip()
+if not line.executable:
-if not line:
 return None, None, line
-shortcut = self.shortcuts.get(line[0])
+return line.cmd, line.arg, line.executable
-if shortcut and hasattr(self, 'do_%s' % shortcut):
-line = '%s %s' % (shortcut, line[1:])
-i, n = 0, len(line)
-while i < n and line[i] in self.identchars: i = i+1
-cmd, arg = line[:i], line[i:].strip()
-return cmd, arg, line
 def showParam(self, param):
 param = self.clean(param)
 if param in self.settable:
 val = getattr(self, param)
 self.stdout.write('%s: %s\n' % (param, str(getattr(self, param))))

Mercurial > python-cmd2

comparison cmd2.py @ 76:dcd5d13e5603