python-cmd2: cmd2.py comparison

comparison cmd2.py @ 406:cc5c68e15a83

merged

author	Catherine Devlin <catherine.devlin@gmail.com>
date	Sun, 07 Nov 2010 09:20:33 -0500
parents	3bef4253cf1b be18c88a0fc8
children	f5aa16a22b52

comparison

equal deleted inserted replaced

-:3bef4253cf1b
+:cc5c68e15a83
 if sys.version_info[0] > 2:
 import pyparsing_py3 as pyparsing
 raw_input = input
 else:
 import pyparsing
-__version__ = '0.6.0'
+__version__ = '0.6.2'
 class OptionParser(optparse.OptionParser):
 def exit(self, status=0, msg=None):
 self.values._exit = True
 if msg:
 def get_paste_buffer():
 xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
 return xclipproc.stdout.read()
 def write_to_paste_buffer(txt):
 xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
-xclipproc.stdin.write(txt)
+xclipproc.stdin.write(txt.encode())
 xclipproc.stdin.close()
 # but we want it in both the "primary" and "mouse" clipboards
 xclipproc = subprocess.Popen('xclip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
-xclipproc.stdin.write(txt)
+xclipproc.stdin.write(txt.encode())
 xclipproc.stdin.close()
 else:
 def get_paste_buffer(*args):
 raise OSError, pastebufferr % ('xclip', 'On Debian/Ubuntu, install with "sudo apt-get install xclip"')
 write_to_paste_buffer = get_paste_buffer
 timing                Report execution times
 abbrev                Accept abbreviated commands
 ''')
 def poutput(self, msg):
+'''Convenient shortcut for self.stdout.write(); adds newline if necessary.'''
 if msg:
 self.stdout.write(msg)
 if msg[-1] != '\n':
 self.stdout.write('\n')
 def perror(self, errmsg, statement=None):
 pyparsing.Optional(fileName) + (pyparsing.stringEnd | '|')
 self.inputParser.ignore(pyparsing.quotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)
 def preparse(self, raw, **kwargs):
 return raw
+def postparse(self, parseResult):
+return parseResult
 def parsed(self, raw, **kwargs):
 if isinstance(raw, ParsedString):
 p = raw
 else:
 # preparse is an overridable hook; default makes no changes
 s = s.replace(shortcut, expansion + ' ', 1)
 break
 result = self.parser.parseString(s)
 result['raw'] = raw
 result['command'] = result.multilineCommand or result.command
+result = self.postparse(result)
 p = ParsedString(result.args)
 p.parsed = result
 p.parser = self.parsed
 for (key, val) in kwargs.items():
 p.parsed[key] = val
 except Exception, e:
 self.perror(str(e), statement)
 finally:
 return self.postparsing_postcmd(stop)
 def complete_statement(self, line):
+"""Keep accepting lines of input until the command is complete."""
 if (not line) or (
 not pyparsing.Or(self.commentGrammars).
 setParseAction(lambda x: '').transformString(line)):
 raise EmptyStatement
 statement = self.parsed(line)
 self.kept_state = Statekeeper(self, ('stdout',))
 self.kept_sys = Statekeeper(sys, ('stdout',))
 self.redirect = subprocess.Popen(statement.parsed.pipeTo, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
 sys.stdout = self.stdout = self.redirect.stdin
 elif statement.parsed.output:
+if (not statement.parsed.outputTo) and (not can_clip):
+self.perror('Cannot redirect to paste buffer; install ``xclip`` and re-run to enable')
+return
 self.kept_state = Statekeeper(self, ('stdout',))
 self.kept_sys = Statekeeper(sys, ('stdout',))
 if statement.parsed.outputTo:
 mode = 'w'
 if statement.parsed.output == '>>':
 mode = 'a'
 sys.stdout = self.stdout = open(os.path.expanduser(statement.parsed.outputTo), mode)
 else:
-sys.stdout = self.stdout = tempfile.TemporaryFile()
+sys.stdout = self.stdout = tempfile.TemporaryFile(mode="w+")
 if statement.parsed.output == '>>':
 self.stdout.write(get_paste_buffer())
 def restore_output(self, statement):
 if self.kept_state:
 """Tries to force a new value into the same type as the current."""
 typ = type(current)
 if typ == bool:
 try:
 return bool(int(new))
-except ValueError, TypeError:
+except (ValueError, TypeError):
 pass
 try:
 new = new.lower()
 except:
 pass
 for fname in glob.glob(fileset):
 tfile = open(fname)
 self.transcripts[fname] = iter(tfile.readlines())
 tfile.close()
 if not len(self.transcripts):
-raise StandardError, "No test files found - nothing to test."
+raise (StandardError,), "No test files found - nothing to test."
 def setUp(self):
 if self.CmdApp:
 self.outputTrap = OutputTrap()
 self.cmdapp = self.CmdApp()
 self.fetchTranscripts()
 anyWhitespace = re.compile(r'\s', re.DOTALL | re.MULTILINE)
 def _test_transcript(self, fname, transcript):
 lineNum = 0
 try:
 line = transcript.next()
+lineNum += 1
 while True:
 while not line.startswith(self.cmdapp.prompt):
 line = transcript.next()
+lineNum += 1
 command = [line[len(self.cmdapp.prompt):]]
 line = transcript.next()
 while line.startswith(self.cmdapp.continuation_prompt):
 command.append(line[len(self.cmdapp.continuation_prompt):])
 line = transcript.next()
+lineNum += 1
 command = ''.join(command)
 stop = self.cmdapp.onecmd_plus_hooks(command)
 #TODO: should act on ``stop``
 result = self.outputTrap.read()
 if line.startswith(self.cmdapp.prompt):
 continue
 expected = []
 while not line.startswith(self.cmdapp.prompt):
 expected.append(line)
 line = transcript.next()
+lineNum += 1
 expected = ''.join(expected)
 message = '\nFile %s, line %d\nCommand was:\n%s\nExpected:\n%s\nGot:\n%s\n'%\
 (fname, lineNum, command, expected, result)
 expected = self.expectationParser.transformString(expected)
 # checking whitespace is a pain - let's skip it
 expected = self.anyWhitespace.sub('', expected)
 result = self.anyWhitespace.sub('', result)
 self.assert_(re.match(expected, result, re.MULTILINE | re.DOTALL), message)
 except StopIteration:
-pass
+message = 'Last %d lines never seen, beginning with\n%s' % (len(expected), expected[0])
+self.assert_(len(expected) < 3, message)
 def tearDown(self):
 if self.CmdApp:
 self.outputTrap.tearDown()
 if __name__ == '__main__':

Mercurial > python-cmd2

comparison cmd2.py @ 406:cc5c68e15a83