annotate cmd2.py @ 241:af17ead6449d

shortened docstring to avoid word wrap
author catherine@dellzilla
date Tue, 24 Mar 2009 15:25:28 -0400
parents a31cf334bc16
children d36ffc16f575
rev   line source
230
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1 """Variant on standard library's cmd with extra features.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
2
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
3 To use, simply import cmd2.Cmd instead of cmd.Cmd; use precisely as though you
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
4 were using the standard library's cmd, while enjoying the extra features.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
5
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
6 Searchable command history (commands: "hi", "li", "run")
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
7 Load commands from file, save to file, edit commands in file
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
8 Multi-line commands
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
9 Case-insensitive commands
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
10 Special-character shortcut commands (beyond cmd's "@" and "!")
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
11 Settable environment parameters
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
12 Optional _onchange_{paramname} called when environment parameter changes
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
13 Parsing commands with `optparse` options (flags)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
14 Redirection to file with >, >>; input from file with <
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
15 Easy transcript-based testing of applications (see example/example.py)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
16
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
17 Note that redirection with > and | will only work if `self.stdout.write()`
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
18 is used in place of `print`. The standard library's `cmd` module is
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
19 written to use `self.stdout.write()`,
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
20
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
21 - Catherine Devlin, Jan 03 2008 - catherinedevlin.blogspot.com
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
22
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
23 mercurial repository at http://www.assembla.com/wiki/show/python-cmd2
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
24 CHANGES:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
25 As of 0.3.0, options should be specified as `optparse` options. See README.txt.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
26 flagReader.py options are still supported for backward compatibility
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
27 """
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
28 import cmd, re, os, sys, optparse, subprocess, tempfile, pyparsing, doctest
235
78ad20c2eed0 py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents: 234
diff changeset
29 import unittest, string, datetime, urllib, inspect
78ad20c2eed0 py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents: 234
diff changeset
30 from code import InteractiveConsole, InteractiveInterpreter, softspace
230
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
31 from optparse import make_option
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
32 __version__ = '0.4.8'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
33
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
34 class OptionParser(optparse.OptionParser):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
35 def exit(self, status=0, msg=None):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
36 self.values._exit = True
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
37 if msg:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
38 print msg
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
39
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
40 def print_help(self, *args, **kwargs):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
41 # now, I need to call help of the calling function. Hmm.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
42 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
43 print self._func.__doc__
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
44 except AttributeError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
45 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
46 optparse.OptionParser.print_help(self, *args, **kwargs)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
47
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
48 def error(self, msg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
49 """error(msg : string)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
50
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
51 Print a usage message incorporating 'msg' to stderr and exit.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
52 If you override this in a subclass, it should not return -- it
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
53 should either exit or raise an exception.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
54 """
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
55 raise
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
56
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
57 def remainingArgs(oldArgs, newArgList):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
58 '''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
59 >>> remainingArgs('-f bar bar cow', ['bar', 'cow'])
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
60 'bar cow'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
61 '''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
62 pattern = '\s+'.join(re.escape(a) for a in newArgList) + '\s*$'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
63 matchObj = re.search(pattern, oldArgs)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
64 return oldArgs[matchObj.start():]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
65
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
66 def options(option_list):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
67 def option_setup(func):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
68 optionParser = OptionParser()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
69 for opt in option_list:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
70 optionParser.add_option(opt)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
71 optionParser.set_usage("%s [options] arg" % func.__name__.strip('do_'))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
72 optionParser._func = func
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
73 def newFunc(instance, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
74 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
75 opts, newArgList = optionParser.parse_args(arg.split()) # doesn't understand quoted strings shouldn't be dissected!
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
76 newArgs = remainingArgs(arg, newArgList) # should it permit flags after args?
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
77 except (optparse.OptionValueError, optparse.BadOptionError,
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
78 optparse.OptionError, optparse.AmbiguousOptionError,
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
79 optparse.OptionConflictError), e:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
80 print e
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
81 optionParser.print_help()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
82 return
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
83 if hasattr(opts, '_exit'):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
84 return None
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
85 if hasattr(arg, 'parser'):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
86 terminator = arg.parsed.terminator
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
87 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
88 if arg.parsed.terminator[0] == '\n':
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
89 terminator = arg.parsed.terminator[0]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
90 except IndexError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
91 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
92 arg = arg.parser('%s %s%s%s' % (arg.parsed.command, newArgs,
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
93 terminator, arg.parsed.suffix))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
94 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
95 arg = newArgs
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
96 result = func(instance, arg, opts)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
97 return result
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
98 newFunc.__doc__ = '%s\n%s' % (func.__doc__, optionParser.format_help())
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
99 return newFunc
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
100 return option_setup
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
101
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
102 class PasteBufferError(EnvironmentError):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
103 if sys.platform[:3] == 'win':
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
104 errmsg = """Redirecting to or from paste buffer requires pywin32
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
105 to be installed on operating system.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
106 Download from http://sourceforge.net/projects/pywin32/"""
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
107 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
108 errmsg = """Redirecting to or from paste buffer requires xclip
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
109 to be installed on operating system.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
110 On Debian/Ubuntu, 'sudo apt-get install xclip' will install it."""
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
111 def __init__(self):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
112 Exception.__init__(self, self.errmsg)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
113
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
114 '''check here if functions exist; otherwise, stub out'''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
115 pastebufferr = """Redirecting to or from paste buffer requires %s
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
116 to be installed on operating system.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
117 %s"""
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
118 if subprocess.mswindows:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
119 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
120 import win32clipboard
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
121 def getPasteBuffer():
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
122 win32clipboard.OpenClipboard(0)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
123 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
124 result = win32clipboard.GetClipboardData()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
125 except TypeError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
126 result = '' #non-text
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
127 win32clipboard.CloseClipboard()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
128 return result
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
129 def writeToPasteBuffer(txt):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
130 win32clipboard.OpenClipboard(0)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
131 win32clipboard.EmptyClipboard()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
132 win32clipboard.SetClipboardText(txt)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
133 win32clipboard.CloseClipboard()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
134 except ImportError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
135 def getPasteBuffer(*args):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
136 raise OSError, pastebufferr % ('pywin32', 'Download from http://sourceforge.net/projects/pywin32/')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
137 setPasteBuffer = getPasteBuffer
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
138 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
139 can_clip = False
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
140 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
141 subprocess.check_call('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
142 can_clip = True
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
143 except AttributeError: # check_call not defined, Python < 2.5
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
144 teststring = 'Testing for presence of xclip.'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
145 xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
146 xclipproc.stdin.write(teststring)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
147 xclipproc.stdin.close()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
148 xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
149 if xclipproc.stdout.read() == teststring:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
150 can_clip = True
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
151 except (subprocess.CalledProcessError, OSError, IOError):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
152 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
153 if can_clip:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
154 def getPasteBuffer():
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
155 xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
156 return xclipproc.stdout.read()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
157 def writeToPasteBuffer(txt):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
158 xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
159 xclipproc.stdin.write(txt)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
160 xclipproc.stdin.close()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
161 # but we want it in both the "primary" and "mouse" clipboards
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
162 xclipproc = subprocess.Popen('xclip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
163 xclipproc.stdin.write(txt)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
164 xclipproc.stdin.close()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
165 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
166 def getPasteBuffer(*args):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
167 raise OSError, pastebufferr % ('xclip', 'On Debian/Ubuntu, install with "sudo apt-get install xclip"')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
168 setPasteBuffer = getPasteBuffer
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
169 writeToPasteBuffer = getPasteBuffer
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
170
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
171 pyparsing.ParserElement.setDefaultWhitespaceChars(' \t')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
172
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
173 class ParsedString(str):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
174 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
175
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
176 class SkipToLast(pyparsing.SkipTo):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
177 def parseImpl( self, instring, loc, doActions=True ):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
178 resultStore = []
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
179 startLoc = loc
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
180 instrlen = len(instring)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
181 expr = self.expr
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
182 failParse = False
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
183 while loc <= instrlen:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
184 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
185 if self.failOn:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
186 failParse = True
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
187 self.failOn.tryParse(instring, loc)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
188 failParse = False
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
189 loc = expr._skipIgnorables( instring, loc )
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
190 expr._parse( instring, loc, doActions=False, callPreParse=False )
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
191 skipText = instring[startLoc:loc]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
192 if self.includeMatch:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
193 loc,mat = expr._parse(instring,loc,doActions,callPreParse=False)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
194 if mat:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
195 skipRes = ParseResults( skipText )
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
196 skipRes += mat
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
197 resultStore.append((loc, [ skipRes ]))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
198 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
199 resultStore,append((loc, [ skipText ]))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
200 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
201 resultStore.append((loc, [ skipText ]))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
202 loc += 1
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
203 except (pyparsing.ParseException,IndexError):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
204 if failParse:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
205 raise
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
206 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
207 loc += 1
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
208 if resultStore:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
209 return resultStore[-1]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
210 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
211 exc = self.myException
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
212 exc.loc = loc
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
213 exc.pstr = instring
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
214 raise exc
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
215
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
216 def replace_with_file_contents(fname):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
217 if fname:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
218 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
219 result = open(os.path.expanduser(fname[0])).read()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
220 except IOError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
221 result = '< %s' % fname[0] # wasn't a file after all
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
222 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
223 result = getPasteBuffer()
233
d2cc9a090b7f now using code.InteractiveConsole
catherine@dellzilla
parents: 232
diff changeset
224 return result
d2cc9a090b7f now using code.InteractiveConsole
catherine@dellzilla
parents: 232
diff changeset
225
234
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
226 class EmbeddedConsoleExit(Exception):
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
227 pass
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
228
235
78ad20c2eed0 py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents: 234
diff changeset
229 class MyInteractiveConsole(InteractiveConsole):
234
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
230 def runcode(self, code):
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
231 """Execute a code object.
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
232
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
233 When an exception occurs, self.showtraceback() is called to
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
234 display a traceback. All exceptions are caught except
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
235 SystemExit, which is reraised.
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
236
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
237 A note about KeyboardInterrupt: this exception may occur
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
238 elsewhere in this code, and may not always be caught. The
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
239 caller should be prepared to deal with it.
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
240
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
241 Copied directly from code.InteractiveInterpreter, except for
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
242 EmbeddedConsoleExit exceptions.
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
243 """
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
244 try:
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
245 exec code in self.locals
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
246 except (SystemExit, EmbeddedConsoleExit):
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
247 raise
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
248 except:
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
249 self.showtraceback()
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
250 else:
235
78ad20c2eed0 py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents: 234
diff changeset
251 if softspace(sys.stdout, 0):
234
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
252 print
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
253
230
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
254 class Cmd(cmd.Cmd):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
255 echo = False
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
256 case_insensitive = True
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
257 continuation_prompt = '> '
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
258 timing = False
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
259 legalChars = '!#$%.:?@_' + pyparsing.alphanums + pyparsing.alphas8bit # make sure your terminators are not in here!
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
260 shortcuts = {'?': 'help', '!': 'shell', '@': 'load' }
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
261 excludeFromHistory = '''run r list l history hi ed edit li eof'''.split()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
262 noSpecialParse = 'set ed edit exit'.split()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
263 defaultExtension = 'txt'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
264 default_file_name = 'command.txt'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
265 abbrev = True
233
d2cc9a090b7f now using code.InteractiveConsole
catherine@dellzilla
parents: 232
diff changeset
266 nonpythoncommand = 'cmd'
230
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
267 settable = ['prompt', 'continuation_prompt', 'default_file_name', 'editor',
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
268 'case_insensitive', 'echo', 'timing', 'abbrev']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
269 settable.sort()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
270
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
271 editor = os.environ.get('EDITOR')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
272 _STOP_AND_EXIT = 2
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
273 if not editor:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
274 if sys.platform[:3] == 'win':
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
275 editor = 'notepad'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
276 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
277 for editor in ['gedit', 'kate', 'vim', 'emacs', 'nano', 'pico']:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
278 if not os.system('which %s' % (editor)):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
279 break
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
280
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
281 def do_cmdenvironment(self, args):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
282 '''Summary report of interactive parameters.'''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
283 self.stdout.write("""
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
284 Commands are %(casesensitive)scase-sensitive.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
285 Commands may be terminated with: %(terminators)s
237
e91808980e59 fixed bug in abbreviated commands
catherine@dellzilla
parents: 236
diff changeset
286 Settable parameters: %(settable)s\n""" % \
230
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
287 { 'casesensitive': (self.case_insensitive and 'not ') or '',
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
288 'terminators': str(self.terminators),
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
289 'settable': ' '.join(self.settable)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
290 })
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
291
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
292 def do_help(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
293 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
294 fn = getattr(self, 'do_' + arg)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
295 if fn and fn.optionParser:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
296 fn.optionParser.print_help(file=self.stdout)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
297 return
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
298 except AttributeError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
299 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
300 cmd.Cmd.do_help(self, arg)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
301
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
302 def __init__(self, *args, **kwargs):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
303 cmd.Cmd.__init__(self, *args, **kwargs)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
304 self.history = History()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
305 self._init_parser()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
306 self.pystate = {}
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
307
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
308 def do_shortcuts(self, args):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
309 """Lists single-key shortcuts available."""
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
310 result = "\n".join('%s: %s' % (sc[0], sc[1]) for sc in self.shortcuts.items())
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
311 self.stdout.write("Single-key shortcuts for other commands:\n%s\n" % (result))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
312
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
313 prefixParser = pyparsing.Empty()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
314 commentGrammars = pyparsing.Or([pyparsing.pythonStyleComment, pyparsing.cStyleComment])
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
315 commentGrammars.addParseAction(lambda x: '')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
316 commentInProgress = ((pyparsing.White() | pyparsing.lineStart) +
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
317 pyparsing.Literal('/*') + pyparsing.SkipTo(pyparsing.stringEnd))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
318 # `blah/*` means `everything in directory `blah`, not comment
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
319 terminators = [';']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
320 blankLinesAllowed = False
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
321 multilineCommands = []
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
322
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
323 def _init_parser(self):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
324 r'''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
325 >>> c = Cmd()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
326 >>> c.multilineCommands = ['multiline']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
327 >>> c.case_insensitive = True
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
328 >>> c._init_parser()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
329 >>> print c.parser.parseString('').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
330 []
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
331 >>> print c.parser.parseString('/* empty command */').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
332 []
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
333 >>> print c.parser.parseString('plainword').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
334 ['plainword', '']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
335 - command: plainword
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
336 - statement: ['plainword', '']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
337 - command: plainword
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
338 >>> print c.parser.parseString('termbare;').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
339 ['termbare', '', ';', '']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
340 - command: termbare
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
341 - statement: ['termbare', '', ';']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
342 - command: termbare
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
343 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
344 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
345 >>> print c.parser.parseString('termbare; suffx').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
346 ['termbare', '', ';', 'suffx']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
347 - command: termbare
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
348 - statement: ['termbare', '', ';']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
349 - command: termbare
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
350 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
351 - suffix: suffx
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
352 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
353 >>> print c.parser.parseString('barecommand').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
354 ['barecommand', '']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
355 - command: barecommand
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
356 - statement: ['barecommand', '']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
357 - command: barecommand
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
358 >>> print c.parser.parseString('COMmand with args').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
359 ['command', 'with args']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
360 - args: with args
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
361 - command: command
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
362 - statement: ['command', 'with args']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
363 - args: with args
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
364 - command: command
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
365 >>> print c.parser.parseString('command with args and terminator; and suffix').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
366 ['command', 'with args and terminator', ';', 'and suffix']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
367 - args: with args and terminator
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
368 - command: command
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
369 - statement: ['command', 'with args and terminator', ';']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
370 - args: with args and terminator
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
371 - command: command
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
372 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
373 - suffix: and suffix
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
374 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
375 >>> print c.parser.parseString('simple | piped').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
376 ['simple', '', '|', ' piped']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
377 - command: simple
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
378 - pipeTo: piped
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
379 - statement: ['simple', '']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
380 - command: simple
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
381 >>> print c.parser.parseString('double-pipe || is not a pipe').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
382 ['double', '-pipe || is not a pipe']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
383 - args: -pipe || is not a pipe
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
384 - command: double
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
385 - statement: ['double', '-pipe || is not a pipe']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
386 - args: -pipe || is not a pipe
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
387 - command: double
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
388 >>> print c.parser.parseString('command with args, terminator;sufx | piped').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
389 ['command', 'with args, terminator', ';', 'sufx', '|', ' piped']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
390 - args: with args, terminator
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
391 - command: command
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
392 - pipeTo: piped
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
393 - statement: ['command', 'with args, terminator', ';']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
394 - args: with args, terminator
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
395 - command: command
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
396 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
397 - suffix: sufx
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
398 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
399 >>> print c.parser.parseString('output into > afile.txt').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
400 ['output', 'into', '>', 'afile.txt']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
401 - args: into
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
402 - command: output
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
403 - output: >
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
404 - outputTo: afile.txt
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
405 - statement: ['output', 'into']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
406 - args: into
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
407 - command: output
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
408 >>> print c.parser.parseString('output into;sufx | pipethrume plz > afile.txt').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
409 ['output', 'into', ';', 'sufx', '|', ' pipethrume plz', '>', 'afile.txt']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
410 - args: into
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
411 - command: output
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
412 - output: >
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
413 - outputTo: afile.txt
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
414 - pipeTo: pipethrume plz
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
415 - statement: ['output', 'into', ';']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
416 - args: into
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
417 - command: output
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
418 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
419 - suffix: sufx
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
420 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
421 >>> print c.parser.parseString('output to paste buffer >> ').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
422 ['output', 'to paste buffer', '>>', '']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
423 - args: to paste buffer
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
424 - command: output
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
425 - output: >>
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
426 - statement: ['output', 'to paste buffer']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
427 - args: to paste buffer
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
428 - command: output
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
429 >>> print c.parser.parseString('ignore the /* commented | > */ stuff;').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
430 ['ignore', 'the /* commented | > */ stuff', ';', '']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
431 - args: the /* commented | > */ stuff
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
432 - command: ignore
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
433 - statement: ['ignore', 'the /* commented | > */ stuff', ';']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
434 - args: the /* commented | > */ stuff
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
435 - command: ignore
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
436 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
437 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
438 >>> print c.parser.parseString('has > inside;').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
439 ['has', '> inside', ';', '']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
440 - args: > inside
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
441 - command: has
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
442 - statement: ['has', '> inside', ';']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
443 - args: > inside
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
444 - command: has
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
445 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
446 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
447 >>> print c.parser.parseString('multiline has > inside an unfinished command').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
448 ['multiline', ' has > inside an unfinished command']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
449 - multilineCommand: multiline
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
450 >>> print c.parser.parseString('multiline has > inside;').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
451 ['multiline', 'has > inside', ';', '']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
452 - args: has > inside
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
453 - multilineCommand: multiline
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
454 - statement: ['multiline', 'has > inside', ';']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
455 - args: has > inside
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
456 - multilineCommand: multiline
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
457 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
458 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
459 >>> print c.parser.parseString('multiline command /* with comment in progress;').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
460 ['multiline', ' command /* with comment in progress;']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
461 - multilineCommand: multiline
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
462 >>> print c.parser.parseString('multiline command /* with comment complete */ is done;').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
463 ['multiline', 'command /* with comment complete */ is done', ';', '']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
464 - args: command /* with comment complete */ is done
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
465 - multilineCommand: multiline
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
466 - statement: ['multiline', 'command /* with comment complete */ is done', ';']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
467 - args: command /* with comment complete */ is done
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
468 - multilineCommand: multiline
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
469 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
470 - terminator: ;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
471 >>> print c.parser.parseString('multiline command ends\n\n').dump()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
472 ['multiline', 'command ends', '\n', '\n']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
473 - args: command ends
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
474 - multilineCommand: multiline
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
475 - statement: ['multiline', 'command ends', '\n', '\n']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
476 - args: command ends
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
477 - multilineCommand: multiline
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
478 - terminator: ['\n', '\n']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
479 - terminator: ['\n', '\n']
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
480 '''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
481 outputParser = (pyparsing.Literal('>>') | (pyparsing.WordStart() + '>') | pyparsing.Regex('[^=]>'))('output')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
482
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
483 terminatorParser = pyparsing.Or([(hasattr(t, 'parseString') and t) or pyparsing.Literal(t) for t in self.terminators])('terminator')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
484 stringEnd = pyparsing.stringEnd ^ '\nEOF'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
485 self.multilineCommand = pyparsing.Or([pyparsing.Keyword(c, caseless=self.case_insensitive) for c in self.multilineCommands])('multilineCommand')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
486 oneLineCommand = (~self.multilineCommand + pyparsing.Word(self.legalChars))('command')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
487 pipe = pyparsing.Keyword('|', identChars='|')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
488 self.commentGrammars.ignore(pyparsing.quotedString).setParseAction(lambda x: '')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
489 self.commentInProgress.ignore(pyparsing.quotedString).ignore(pyparsing.cStyleComment)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
490 afterElements = \
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
491 pyparsing.Optional(pipe + pyparsing.SkipTo(outputParser ^ stringEnd)('pipeTo')) + \
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
492 pyparsing.Optional(outputParser + pyparsing.SkipTo(stringEnd).setParseAction(lambda x: x[0].strip())('outputTo'))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
493 if self.case_insensitive:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
494 self.multilineCommand.setParseAction(lambda x: x[0].lower())
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
495 oneLineCommand.setParseAction(lambda x: x[0].lower())
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
496 if self.blankLinesAllowed:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
497 self.blankLineTerminationParser = pyparsing.NoMatch
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
498 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
499 self.blankLineTerminator = (pyparsing.lineEnd + pyparsing.lineEnd)('terminator')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
500 self.blankLineTerminator.setResultsName('terminator')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
501 self.blankLineTerminationParser = ((self.multilineCommand ^ oneLineCommand) + pyparsing.SkipTo(self.blankLineTerminator).setParseAction(lambda x: x[0].strip())('args') + self.blankLineTerminator)('statement')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
502 self.multilineParser = (((self.multilineCommand ^ oneLineCommand) + SkipToLast(terminatorParser).setParseAction(lambda x: x[0].strip())('args') + terminatorParser)('statement') +
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
503 pyparsing.SkipTo(outputParser ^ pipe ^ stringEnd).setParseAction(lambda x: x[0].strip())('suffix') + afterElements)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
504 self.singleLineParser = ((oneLineCommand + pyparsing.SkipTo(terminatorParser ^ stringEnd ^ pipe ^ outputParser).setParseAction(lambda x:x[0].strip())('args'))('statement') +
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
505 pyparsing.Optional(terminatorParser) + afterElements)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
506 #self.multilineParser = self.multilineParser.setResultsName('multilineParser')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
507 #self.singleLineParser = self.singleLineParser.setResultsName('singleLineParser')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
508 #self.blankLineTerminationParser = self.blankLineTerminationParser.setResultsName('blankLineTerminatorParser')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
509 self.parser = (
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
510 stringEnd |
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
511 self.prefixParser + self.multilineParser |
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
512 self.prefixParser + self.singleLineParser |
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
513 self.prefixParser + self.blankLineTerminationParser |
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
514 self.prefixParser + self.multilineCommand + pyparsing.SkipTo(stringEnd)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
515 )
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
516 self.parser.ignore(pyparsing.quotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
517
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
518 inputMark = pyparsing.Literal('<')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
519 inputMark.setParseAction(lambda x: '')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
520 fileName = pyparsing.Word(self.legalChars + '/\\')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
521 inputFrom = fileName('inputFrom')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
522 inputFrom.setParseAction(replace_with_file_contents)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
523 # a not-entirely-satisfactory way of distinguishing < as in "import from" from <
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
524 # as in "lesser than"
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
525 self.inputParser = inputMark + pyparsing.Optional(inputFrom) + pyparsing.Optional('>') + \
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
526 pyparsing.Optional(fileName) + (pyparsing.stringEnd | '|')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
527 self.inputParser.ignore(pyparsing.quotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
528
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
529 def preparse(self, raw, **kwargs):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
530 return raw
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
531
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
532 def parsed(self, raw, **kwargs):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
533 if isinstance(raw, ParsedString):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
534 p = raw
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
535 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
536 raw = self.preparse(raw, **kwargs)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
537 s = self.inputParser.transformString(raw.lstrip())
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
538 for (shortcut, expansion) in self.shortcuts.items():
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
539 if s.lower().startswith(shortcut):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
540 s = s.replace(shortcut, expansion + ' ', 1)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
541 break
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
542 result = self.parser.parseString(s)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
543 result['command'] = result.multilineCommand or result.command
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
544 result['raw'] = raw
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
545 result['clean'] = self.commentGrammars.transformString(result.args)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
546 result['expanded'] = s
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
547 p = ParsedString(result.clean)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
548 p.parsed = result
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
549 p.parser = self.parsed
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
550 for (key, val) in kwargs.items():
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
551 p.parsed[key] = val
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
552 return p
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
553
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
554 def postparsing_precmd(self, statement):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
555 stop = 0
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
556 return stop, statement
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
557 def postparsing_postcmd(self, stop):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
558 return stop
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
559 def onecmd(self, line):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
560 """Interpret the argument as though it had been typed in response
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
561 to the prompt.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
562
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
563 This may be overridden, but should not normally need to be;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
564 see the precmd() and postcmd() methods for useful execution hooks.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
565 The return value is a flag indicating whether interpretation of
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
566 commands by the interpreter should stop.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
567
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
568 This (`cmd2`) version of `onecmd` already override's `cmd`'s `onecmd`.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
569
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
570 """
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
571 if not line:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
572 return self.emptyline()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
573 if not pyparsing.Or(self.commentGrammars).setParseAction(lambda x: '').transformString(line):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
574 return 0 # command was empty except for comments
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
575 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
576 statement = self.parsed(line)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
577 while statement.parsed.multilineCommand and (statement.parsed.terminator == ''):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
578 statement = '%s\n%s' % (statement.parsed.raw,
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
579 self.pseudo_raw_input(self.continuation_prompt))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
580 statement = self.parsed(statement)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
581 except Exception, e:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
582 print e
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
583 return 0
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
584
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
585 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
586 (stop, statement) = self.postparsing_precmd(statement)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
587 except Exception, e:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
588 print str(e)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
589 return 0
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
590 if stop:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
591 return self.postparsing_postcmd(stop)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
592
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
593 if not statement.parsed.command:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
594 return self.postparsing_postcmd(stop=0)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
595
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
596 statekeeper = None
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
597
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
598 if statement.parsed.pipeTo:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
599 redirect = subprocess.Popen(statement.parsed.pipeTo, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
600 statekeeper = Statekeeper(self, ('stdout',))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
601 self.stdout = redirect.stdin
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
602 elif statement.parsed.output:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
603 statekeeper = Statekeeper(self, ('stdout',))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
604 if statement.parsed.outputTo:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
605 mode = 'w'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
606 if statement.parsed.output == '>>':
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
607 mode = 'a'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
608 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
609 self.stdout = open(os.path.expanduser(statement.parsed.outputTo), mode)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
610 except OSError, e:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
611 print e
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
612 return self.postparsing_postcmd(stop=0)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
613 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
614 statekeeper = Statekeeper(self, ('stdout',))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
615 self.stdout = tempfile.TemporaryFile()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
616 if statement.parsed.output == '>>':
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
617 self.stdout.write(getPasteBuffer())
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
618 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
619 # "heart" of the command, replace's cmd's onecmd()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
620 self.lastcmd = statement.parsed.expanded
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
621 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
622 func = getattr(self, 'do_' + statement.parsed.command)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
623 except AttributeError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
624 func = None
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
625 if self.abbrev: # accept shortened versions of commands
237
e91808980e59 fixed bug in abbreviated commands
catherine@dellzilla
parents: 236
diff changeset
626 funcs = [(fname, function) for (fname, function) in inspect.getmembers(self, inspect.ismethod)
230
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
627 if fname.startswith('do_' + statement.parsed.command)]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
628 if len(funcs) == 1:
237
e91808980e59 fixed bug in abbreviated commands
catherine@dellzilla
parents: 236
diff changeset
629 func = funcs[0][1]
230
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
630 if not func:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
631 return self.postparsing_postcmd(self.default(statement))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
632 timestart = datetime.datetime.now()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
633 stop = func(statement)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
634 if self.timing:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
635 print 'Elapsed: %s' % str(datetime.datetime.now() - timestart)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
636 except Exception, e:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
637 print e
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
638 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
639 if statement.parsed.command not in self.excludeFromHistory:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
640 self.history.append(statement.parsed.raw)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
641 finally:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
642 if statekeeper:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
643 if statement.parsed.output and not statement.parsed.outputTo:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
644 self.stdout.seek(0)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
645 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
646 writeToPasteBuffer(self.stdout.read())
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
647 except Exception, e:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
648 print str(e)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
649 elif statement.parsed.pipeTo:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
650 for result in redirect.communicate():
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
651 statekeeper.stdout.write(result or '')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
652 self.stdout.close()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
653 statekeeper.restore()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
654
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
655 return self.postparsing_postcmd(stop)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
656
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
657 def pseudo_raw_input(self, prompt):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
658 """copied from cmd's cmdloop; like raw_input, but accounts for changed stdin, stdout"""
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
659
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
660 if self.use_rawinput:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
661 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
662 line = raw_input(prompt)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
663 except EOFError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
664 line = 'EOF'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
665 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
666 self.stdout.write(prompt)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
667 self.stdout.flush()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
668 line = self.stdin.readline()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
669 if not len(line):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
670 line = 'EOF'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
671 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
672 if line[-1] == '\n': # this was always true in Cmd
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
673 line = line[:-1]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
674 return line
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
675
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
676 def cmdloop(self, intro=None):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
677 """Repeatedly issue a prompt, accept input, parse an initial prefix
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
678 off the received input, and dispatch to action methods, passing them
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
679 the remainder of the line as argument.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
680 """
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
681
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
682 # An almost perfect copy from Cmd; however, the pseudo_raw_input portion
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
683 # has been split out so that it can be called separately
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
684
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
685 self.preloop()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
686 if self.use_rawinput and self.completekey:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
687 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
688 import readline
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
689 self.old_completer = readline.get_completer()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
690 readline.set_completer(self.complete)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
691 readline.parse_and_bind(self.completekey+": complete")
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
692 except ImportError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
693 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
694 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
695 if intro is not None:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
696 self.intro = intro
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
697 if self.intro:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
698 self.stdout.write(str(self.intro)+"\n")
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
699 stop = None
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
700 while not stop:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
701 if self.cmdqueue:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
702 line = self.cmdqueue.pop(0)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
703 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
704 line = self.pseudo_raw_input(self.prompt)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
705 if (self.echo) and (isinstance(self.stdin, file)):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
706 self.stdout.write(line + '\n')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
707 line = self.precmd(line)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
708 stop = self.onecmd(line)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
709 stop = self.postcmd(stop, line)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
710 self.postloop()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
711 finally:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
712 if self.use_rawinput and self.completekey:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
713 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
714 import readline
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
715 readline.set_completer(self.old_completer)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
716 except ImportError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
717 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
718 return stop
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
719
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
720 def do_EOF(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
721 return True
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
722 do_eof = do_EOF
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
723
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
724 def showParam(self, param):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
725 any_shown = False
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
726 param = param.strip().lower()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
727 for p in self.settable:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
728 if p.startswith(param):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
729 val = getattr(self, p)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
730 self.stdout.write('%s: %s\n' % (p, str(getattr(self, p))))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
731 any_shown = True
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
732 if not any_shown:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
733 print "Parameter '%s' not supported (type 'show' for list of parameters)." % param
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
734
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
735 def do_quit(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
736 return self._STOP_AND_EXIT
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
737 do_exit = do_quit
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
738 do_q = do_quit
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
739
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
740 def do_show(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
741 '''Shows value of a parameter.'''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
742 if arg.strip():
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
743 self.showParam(arg)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
744 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
745 for param in self.settable:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
746 self.showParam(param)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
747
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
748 def do_set(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
749 '''Sets a cmd2 parameter. Accepts abbreviated parameter names so long as there is no ambiguity.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
750 Call without arguments for a list of settable parameters with their values.'''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
751 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
752 paramName, val = arg.split(None, 1)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
753 paramName = paramName.strip().lower()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
754 hits = [paramName in p for p in self.settable]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
755 if hits.count(True) == 1:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
756 paramName = self.settable[hits.index(True)]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
757 currentVal = getattr(self, paramName)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
758 if (val[0] == val[-1]) and val[0] in ("'", '"'):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
759 val = val[1:-1]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
760 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
761 val = cast(currentVal, val)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
762 setattr(self, paramName, val)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
763 self.stdout.write('%s - was: %s\nnow: %s\n' % (paramName, currentVal, val))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
764 if currentVal != val:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
765 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
766 onchange_hook = getattr(self, '_onchange_%s' % paramName)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
767 onchange_hook(old=currentVal, new=val)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
768 except AttributeError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
769 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
770 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
771 self.do_show(paramName)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
772 except (ValueError, AttributeError, NotSettableError), e:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
773 self.do_show(arg)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
774
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
775 def do_pause(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
776 'Displays the specified text then waits for the user to press RETURN.'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
777 raw_input(arg + '\n')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
778
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
779 def do_shell(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
780 'execute a command as if at the OS prompt.'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
781 os.system(arg)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
782
231
18bf83a77e0e woot, sql within by
catherine@dellzilla
parents: 230
diff changeset
783 def _attempt_py_command(self, arg):
18bf83a77e0e woot, sql within by
catherine@dellzilla
parents: 230
diff changeset
784 try:
18bf83a77e0e woot, sql within by
catherine@dellzilla
parents: 230
diff changeset
785 result = eval(arg, self.pystate)
18bf83a77e0e woot, sql within by
catherine@dellzilla
parents: 230
diff changeset
786 print repr(result)
18bf83a77e0e woot, sql within by
catherine@dellzilla
parents: 230
diff changeset
787 except SyntaxError:
18bf83a77e0e woot, sql within by
catherine@dellzilla
parents: 230
diff changeset
788 exec(arg, self.pystate)
18bf83a77e0e woot, sql within by
catherine@dellzilla
parents: 230
diff changeset
789 return
18bf83a77e0e woot, sql within by
catherine@dellzilla
parents: 230
diff changeset
790
233
d2cc9a090b7f now using code.InteractiveConsole
catherine@dellzilla
parents: 232
diff changeset
791 def do_py(self, arg):
230
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
792 '''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
793 py <command>: Executes a Python command.
241
af17ead6449d shortened docstring to avoid word wrap
catherine@dellzilla
parents: 240
diff changeset
794 py: Enters interactive Python mode; `Ctrl-D`, `quit()`, 'exit()` ends.
af17ead6449d shortened docstring to avoid word wrap
catherine@dellzilla
parents: 240
diff changeset
795 Non-python commands can be issued with `cmd("your command")`.
230
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
796 '''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
797 if arg.strip():
235
78ad20c2eed0 py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents: 234
diff changeset
798 interp = InteractiveInterpreter(locals=self.pystate)
233
d2cc9a090b7f now using code.InteractiveConsole
catherine@dellzilla
parents: 232
diff changeset
799 interp.runcode(arg)
230
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
800 else:
235
78ad20c2eed0 py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents: 234
diff changeset
801 interp = MyInteractiveConsole(locals=self.pystate)
233
d2cc9a090b7f now using code.InteractiveConsole
catherine@dellzilla
parents: 232
diff changeset
802 def quit():
234
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
803 raise EmbeddedConsoleExit
236
035330ccfcf0 py really working right now
catherine@dellzilla
parents: 235
diff changeset
804 def onecmd(arg):
035330ccfcf0 py really working right now
catherine@dellzilla
parents: 235
diff changeset
805 return self.onecmd(arg + '\n')
233
d2cc9a090b7f now using code.InteractiveConsole
catherine@dellzilla
parents: 232
diff changeset
806 self.pystate['quit'] = quit
d2cc9a090b7f now using code.InteractiveConsole
catherine@dellzilla
parents: 232
diff changeset
807 self.pystate['exit'] = quit
236
035330ccfcf0 py really working right now
catherine@dellzilla
parents: 235
diff changeset
808 self.pystate[self.nonpythoncommand] = onecmd
234
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
809 try:
240
a31cf334bc16 tweaking documentation
catherine@dellzilla
parents: 237
diff changeset
810 cprt = 'Type "help", "copyright", "credits" or "license" for more information.'
a31cf334bc16 tweaking documentation
catherine@dellzilla
parents: 237
diff changeset
811 interp.interact(banner= "Python %s on %s\n%s\n(%s)\n%s" %
a31cf334bc16 tweaking documentation
catherine@dellzilla
parents: 237
diff changeset
812 (sys.version, sys.platform, cprt, self.__class__.__name__, self.do_py.__doc__))
235
78ad20c2eed0 py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents: 234
diff changeset
813 except EmbeddedConsoleExit:
234
ff99b39259d5 maybe quit and exit work now?
catherine@dellzilla
parents: 233
diff changeset
814 return
233
d2cc9a090b7f now using code.InteractiveConsole
catherine@dellzilla
parents: 232
diff changeset
815
230
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
816 def do_history(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
817 """history [arg]: lists past commands issued
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
818
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
819 no arg -> list all
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
820 arg is integer -> list one history item, by index
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
821 arg is string -> string search
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
822 arg is /enclosed in forward-slashes/ -> regular expression search
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
823 """
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
824 if arg:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
825 history = self.history.get(arg)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
826 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
827 history = self.history
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
828 for hi in history:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
829 self.stdout.write(hi.pr())
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
830 def last_matching(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
831 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
832 if arg:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
833 return self.history.get(arg)[-1]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
834 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
835 return self.history[-1]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
836 except IndexError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
837 return None
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
838 def do_list(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
839 """list [arg]: lists last command issued
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
840
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
841 no arg -> list absolute last
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
842 arg is integer -> list one history item, by index
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
843 - arg, arg - (integer) -> list up to or after #arg
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
844 arg is string -> list last command matching string search
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
845 arg is /enclosed in forward-slashes/ -> regular expression search
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
846 """
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
847 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
848 self.stdout.write(self.last_matching(arg).pr())
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
849 except:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
850 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
851 do_hi = do_history
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
852 do_l = do_list
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
853 do_li = do_list
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
854
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
855 def do_ed(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
856 """ed: edit most recent command in text editor
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
857 ed [N]: edit numbered command from history
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
858 ed [filename]: edit specified file name
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
859
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
860 commands are run after editor is closed.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
861 "set edit (program-name)" or set EDITOR environment variable
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
862 to control which editing program is used."""
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
863 if not self.editor:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
864 print "please use 'set editor' to specify your text editing program of choice."
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
865 return
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
866 filename = self.default_file_name
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
867 if arg:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
868 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
869 buffer = self.last_matching(int(arg))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
870 except ValueError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
871 filename = arg
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
872 buffer = ''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
873 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
874 buffer = self.history[-1]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
875
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
876 if buffer:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
877 f = open(os.path.expanduser(filename), 'w')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
878 f.write(buffer or '')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
879 f.close()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
880
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
881 os.system('%s %s' % (self.editor, filename))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
882 self.do__load(filename)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
883 do_edit = do_ed
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
884
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
885 saveparser = (pyparsing.Optional(pyparsing.Word(pyparsing.nums)^'*')("idx") +
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
886 pyparsing.Optional(pyparsing.Word(legalChars + '/\\'))("fname") +
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
887 pyparsing.stringEnd)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
888 def do_save(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
889 """`save [N] [filename.ext]`
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
890 Saves command from history to file.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
891 N => Number of command (from history), or `*`;
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
892 most recent command if omitted"""
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
893
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
894 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
895 args = self.saveparser.parseString(arg)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
896 except pyparsing.ParseException:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
897 print self.do_save.__doc__
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
898 return
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
899 fname = args.fname or self.default_file_name
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
900 if args.idx == '*':
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
901 saveme = '\n\n'.join(self.history[:])
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
902 elif args.idx:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
903 saveme = self.history[int(args.idx)-1]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
904 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
905 saveme = self.history[-1]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
906 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
907 f = open(os.path.expanduser(fname), 'w')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
908 f.write(saveme)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
909 f.close()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
910 print 'Saved to %s' % (fname)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
911 except Exception, e:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
912 print 'Error saving %s: %s' % (fname, str(e))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
913
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
914 urlre = re.compile('(https?://[-\\w\\./]+)')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
915 def do_load(self, fname=None):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
916 """Runs script of command(s) from a file or URL."""
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
917 if fname is None:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
918 fname = self.default_file_name
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
919 keepstate = Statekeeper(self, ('stdin','use_rawinput','prompt','continuation_prompt'))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
920 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
921 if isinstance(fname, file):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
922 target = open(fname, 'r')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
923 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
924 match = self.urlre.match(fname)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
925 if match:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
926 target = urllib.urlopen(match.group(1))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
927 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
928 fname = os.path.expanduser(fname)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
929 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
930 target = open(os.path.expanduser(fname), 'r')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
931 except IOError, e:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
932 target = open('%s.%s' % (os.path.expanduser(fname),
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
933 self.defaultExtension), 'r')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
934 except IOError, e:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
935 print 'Problem accessing script from %s: \n%s' % (fname, e)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
936 keepstate.restore()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
937 return
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
938 self.stdin = target
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
939 self.use_rawinput = False
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
940 self.prompt = self.continuation_prompt = ''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
941 stop = self.cmdloop()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
942 self.stdin.close()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
943 keepstate.restore()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
944 self.lastcmd = ''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
945 return (stop == self._STOP_AND_EXIT) and self._STOP_AND_EXIT
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
946 do__load = do_load # avoid an unfortunate legacy use of do_load from sqlpython
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
947
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
948 def do_run(self, arg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
949 """run [arg]: re-runs an earlier command
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
950
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
951 no arg -> run most recent command
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
952 arg is integer -> run one history item, by index
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
953 arg is string -> run most recent command by string search
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
954 arg is /enclosed in forward-slashes/ -> run most recent by regex
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
955 """
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
956 'run [N]: runs the SQL that was run N commands ago'
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
957 runme = self.last_matching(arg)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
958 print runme
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
959 if runme:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
960 runme = self.precmd(runme)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
961 stop = self.onecmd(runme)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
962 stop = self.postcmd(stop, runme)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
963 do_r = do_run
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
964
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
965 def fileimport(self, statement, source):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
966 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
967 f = open(os.path.expanduser(source))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
968 except IOError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
969 self.stdout.write("Couldn't read from file %s\n" % source)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
970 return ''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
971 data = f.read()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
972 f.close()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
973 return data
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
974
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
975 class HistoryItem(str):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
976 def __init__(self, instr):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
977 str.__init__(self)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
978 self.lowercase = self.lower()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
979 self.idx = None
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
980 def pr(self):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
981 return '-------------------------[%d]\n%s\n' % (self.idx, str(self))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
982
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
983 class History(list):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
984 rangeFrom = re.compile(r'^([\d])+\s*\-$')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
985 def append(self, new):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
986 new = HistoryItem(new)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
987 list.append(self, new)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
988 new.idx = len(self)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
989 def extend(self, new):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
990 for n in new:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
991 self.append(n)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
992 def get(self, getme):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
993 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
994 getme = int(getme)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
995 if getme < 0:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
996 return self[:(-1 * getme)]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
997 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
998 return [self[getme-1]]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
999 except IndexError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1000 return []
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1001 except (ValueError, TypeError):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1002 getme = getme.strip()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1003 mtch = self.rangeFrom.search(getme)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1004 if mtch:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1005 return self[(int(mtch.group(1))-1):]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1006 if getme.startswith(r'/') and getme.endswith(r'/'):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1007 finder = re.compile(getme[1:-1], re.DOTALL | re.MULTILINE | re.IGNORECASE)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1008 def isin(hi):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1009 return finder.search(hi)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1010 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1011 def isin(hi):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1012 return (getme.lower() in hi.lowercase)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1013 return [itm for itm in self if isin(itm)]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1014
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1015 class NotSettableError(Exception):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1016 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1017
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1018 def cast(current, new):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1019 """Tries to force a new value into the same type as the current."""
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1020 typ = type(current)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1021 if typ == bool:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1022 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1023 return bool(int(new))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1024 except ValueError, TypeError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1025 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1026 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1027 new = new.lower()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1028 except:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1029 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1030 if (new=='on') or (new[0] in ('y','t')):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1031 return True
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1032 if (new=='off') or (new[0] in ('n','f')):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1033 return False
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1034 else:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1035 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1036 return typ(new)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1037 except:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1038 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1039 print "Problem setting parameter (now %s) to %s; incorrect type?" % (current, new)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1040 return current
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1041
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1042 class Statekeeper(object):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1043 def __init__(self, obj, attribs):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1044 self.obj = obj
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1045 self.attribs = attribs
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1046 self.save()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1047 def save(self):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1048 for attrib in self.attribs:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1049 setattr(self, attrib, getattr(self.obj, attrib))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1050 def restore(self):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1051 for attrib in self.attribs:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1052 setattr(self.obj, attrib, getattr(self, attrib))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1053
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1054 class Borg(object):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1055 '''All instances of any Borg subclass will share state.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1056 from Python Cookbook, 2nd Ed., recipe 6.16'''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1057 _shared_state = {}
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1058 def __new__(cls, *a, **k):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1059 obj = object.__new__(cls, *a, **k)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1060 obj.__dict__ = cls._shared_state
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1061 return obj
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1062
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1063 class OutputTrap(Borg):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1064 '''Instantiate an OutputTrap to divert/capture ALL stdout output. For use in unit testing.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1065 Call `tearDown()` to return to normal output.'''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1066 def __init__(self):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1067 self.old_stdout = sys.stdout
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1068 self.trap = tempfile.TemporaryFile()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1069 sys.stdout = self.trap
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1070 def read(self):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1071 self.trap.seek(0)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1072 result = self.trap.read()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1073 self.trap.truncate(0)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1074 return result.strip('\x00')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1075 def tearDown(self):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1076 sys.stdout = self.old_stdout
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1077
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1078 class Cmd2TestCase(unittest.TestCase):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1079 '''Subclass this, setting CmdApp and transcriptFileName, to make a unittest.TestCase class
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1080 that will execute the commands in transcriptFileName and expect the results shown.
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1081 See example.py'''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1082 CmdApp = None
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1083 transcriptFileName = ''
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1084 def setUp(self):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1085 if self.CmdApp:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1086 self.outputTrap = OutputTrap()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1087 self.cmdapp = self.CmdApp()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1088 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1089 tfile = open(os.path.expanduser(self.transcriptFileName))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1090 self.transcript = iter(tfile.readlines())
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1091 tfile.close()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1092 except IOError:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1093 self.transcript = []
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1094 def assertEqualEnough(self, got, expected, message):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1095 got = got.strip().splitlines()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1096 expected = expected.strip().splitlines()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1097 self.assertEqual(len(got), len(expected), message)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1098 for (linegot, lineexpected) in zip(got, expected):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1099 matchme = re.escape(lineexpected.strip()).replace('\\*', '.*'). \
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1100 replace('\\ ', ' ')
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1101 self.assert_(re.match(matchme, linegot.strip()), message)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1102 def testall(self):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1103 if self.CmdApp:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1104 lineNum = 0
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1105 try:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1106 line = self.transcript.next()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1107 while True:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1108 while not line.startswith(self.cmdapp.prompt):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1109 line = self.transcript.next()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1110 command = [line[len(self.cmdapp.prompt):]]
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1111 line = self.transcript.next()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1112 while line.startswith(self.cmdapp.continuation_prompt):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1113 command.append(line[len(self.cmdapp.continuation_prompt):])
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1114 line = self.transcript.next()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1115 command = ''.join(command)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1116 self.cmdapp.onecmd(command)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1117 result = self.outputTrap.read()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1118 if line.startswith(self.cmdapp.prompt):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1119 self.assertEqualEnough(result.strip(), '',
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1120 '\nFile %s, line %d\nCommand was:\n%s\nExpected: (nothing) \nGot:\n%s\n' %
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1121 (self.transcriptFileName, lineNum, command, result))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1122 continue
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1123 expected = []
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1124 while not line.startswith(self.cmdapp.prompt):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1125 expected.append(line)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1126 line = self.transcript.next()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1127 expected = ''.join(expected)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1128 self.assertEqualEnough(expected.strip(), result.strip(),
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1129 '\nFile %s, line %d\nCommand was:\n%s\nExpected:\n%s\nGot:\n%s\n' %
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1130 (self.transcriptFileName, lineNum, command, expected, result))
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1131 # this needs to account for a line-by-line strip()ping
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1132 except StopIteration:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1133 pass
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1134 # catch the final output?
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1135 def tearDown(self):
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1136 if self.CmdApp:
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1137 self.outputTrap.tearDown()
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1138
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1139 if __name__ == '__main__':
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1140 doctest.testmod(optionflags = doctest.NORMALIZE_WHITESPACE)
fea183146819 merged abbrev changes
catherine@dellzilla
parents: 226 229
diff changeset
1141 #c = Cmd()