Mercurial > python-cmd2
annotate cmd2.py @ 328:7b2bca3951a7
locals_in_py
author | cat@eee |
---|---|
date | Fri, 12 Feb 2010 15:35:48 -0500 |
parents | e9eea93c777c |
children | c69ad8418d39 |
rev | line source |
---|---|
230 | 1 """Variant on standard library's cmd with extra features. |
2 | |
3 To use, simply import cmd2.Cmd instead of cmd.Cmd; use precisely as though you | |
4 were using the standard library's cmd, while enjoying the extra features. | |
5 | |
6 Searchable command history (commands: "hi", "li", "run") | |
7 Load commands from file, save to file, edit commands in file | |
8 Multi-line commands | |
9 Case-insensitive commands | |
10 Special-character shortcut commands (beyond cmd's "@" and "!") | |
11 Settable environment parameters | |
12 Optional _onchange_{paramname} called when environment parameter changes | |
13 Parsing commands with `optparse` options (flags) | |
14 Redirection to file with >, >>; input from file with < | |
15 Easy transcript-based testing of applications (see example/example.py) | |
310 | 16 Bash-style ``select`` available |
230 | 17 |
18 Note that redirection with > and | will only work if `self.stdout.write()` | |
19 is used in place of `print`. The standard library's `cmd` module is | |
20 written to use `self.stdout.write()`, | |
21 | |
22 - Catherine Devlin, Jan 03 2008 - catherinedevlin.blogspot.com | |
23 | |
24 mercurial repository at http://www.assembla.com/wiki/show/python-cmd2 | |
25 """ | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
26 import cmd |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
27 import re |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
28 import os |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
29 import sys |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
30 import optparse |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
31 import subprocess |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
32 import tempfile |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
33 import doctest |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
34 import unittest |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
35 import datetime |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
36 import urllib |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
37 import glob |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
38 import traceback |
312 | 39 import platform |
323 | 40 import copy |
235
78ad20c2eed0
py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents:
234
diff
changeset
|
41 from code import InteractiveConsole, InteractiveInterpreter, softspace |
230 | 42 from optparse import make_option |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
43 |
309 | 44 if sys.version_info[0] > 2: |
45 import pyparsing_py3 as pyparsing | |
46 else: | |
47 import pyparsing | |
48 | |
312 | 49 __version__ = '0.6.0' |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
50 |
230 | 51 class OptionParser(optparse.OptionParser): |
52 def exit(self, status=0, msg=None): | |
53 self.values._exit = True | |
54 if msg: | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
55 print (msg) |
230 | 56 |
57 def print_help(self, *args, **kwargs): | |
58 try: | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
59 print (self._func.__doc__) |
230 | 60 except AttributeError: |
61 pass | |
62 optparse.OptionParser.print_help(self, *args, **kwargs) | |
63 | |
64 def error(self, msg): | |
65 """error(msg : string) | |
66 | |
67 Print a usage message incorporating 'msg' to stderr and exit. | |
68 If you override this in a subclass, it should not return -- it | |
69 should either exit or raise an exception. | |
70 """ | |
71 raise | |
72 | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
73 def remaining_args(oldArgs, newArgList): |
230 | 74 ''' |
285 | 75 Preserves the spacing originally in the argument after |
76 the removal of options. | |
77 | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
78 >>> remaining_args('-f bar bar cow', ['bar', 'cow']) |
230 | 79 'bar cow' |
80 ''' | |
81 pattern = '\s+'.join(re.escape(a) for a in newArgList) + '\s*$' | |
82 matchObj = re.search(pattern, oldArgs) | |
83 return oldArgs[matchObj.start():] | |
280 | 84 |
85 def _attr_get_(obj, attr): | |
86 '''Returns an attribute's value, or None (no error) if undefined. | |
286 | 87 Analagous to .get() for dictionaries. Useful when checking for |
88 value of options that may not have been defined on a given | |
89 method.''' | |
280 | 90 try: |
91 return getattr(obj, attr) | |
92 except AttributeError: | |
93 return None | |
283 | 94 |
95 optparse.Values.get = _attr_get_ | |
96 | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
97 options_defined = [] # used to distinguish --options from SQL-style --comments |
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
98 |
230 | 99 def options(option_list): |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
100 '''Used as a decorator and passed a list of optparse-style options, |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
101 alters a cmd2 methodo populate its ``opts`` argument from its |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
102 raw text argument. |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
103 |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
104 Example: transform |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
105 def do_something(self, arg): |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
106 |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
107 into |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
108 @options([make_option('-q', '--quick', action="store_true", |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
109 help="Makes things fast")]) |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
110 def do_something(self, arg, opts): |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
111 if opts.quick: |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
112 self.fast_button = True |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
113 ''' |
296 | 114 if not isinstance(option_list, list): |
298 | 115 option_list = [option_list] |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
116 for opt in option_list: |
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
117 options_defined.append(pyparsing.Literal(opt.get_opt_string())) |
230 | 118 def option_setup(func): |
119 optionParser = OptionParser() | |
120 for opt in option_list: | |
121 optionParser.add_option(opt) | |
122 optionParser.set_usage("%s [options] arg" % func.__name__.strip('do_')) | |
123 optionParser._func = func | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
124 def new_func(instance, arg): |
230 | 125 try: |
302 | 126 opts, newArgList = optionParser.parse_args(arg.split()) |
285 | 127 # Must find the remaining args in the original argument list, but |
128 # mustn't include the command itself | |
302 | 129 #if hasattr(arg, 'parsed') and newArgList[0] == arg.parsed.command: |
130 # newArgList = newArgList[1:] | |
131 newArgs = remaining_args(arg, newArgList) | |
301 | 132 if isinstance(arg, ParsedString): |
133 arg = arg.with_args_replaced(newArgs) | |
134 else: | |
135 arg = newArgs | |
230 | 136 except (optparse.OptionValueError, optparse.BadOptionError, |
137 optparse.OptionError, optparse.AmbiguousOptionError, | |
138 optparse.OptionConflictError), e: | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
139 print (e) |
230 | 140 optionParser.print_help() |
141 return | |
142 if hasattr(opts, '_exit'): | |
143 return None | |
144 result = func(instance, arg, opts) | |
145 return result | |
289 | 146 new_func.__doc__ = '%s\n%s' % (func.__doc__, optionParser.format_help()) |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
147 return new_func |
230 | 148 return option_setup |
149 | |
150 class PasteBufferError(EnvironmentError): | |
151 if sys.platform[:3] == 'win': | |
152 errmsg = """Redirecting to or from paste buffer requires pywin32 | |
153 to be installed on operating system. | |
154 Download from http://sourceforge.net/projects/pywin32/""" | |
155 else: | |
156 errmsg = """Redirecting to or from paste buffer requires xclip | |
157 to be installed on operating system. | |
158 On Debian/Ubuntu, 'sudo apt-get install xclip' will install it.""" | |
159 def __init__(self): | |
160 Exception.__init__(self, self.errmsg) | |
161 | |
162 pastebufferr = """Redirecting to or from paste buffer requires %s | |
163 to be installed on operating system. | |
164 %s""" | |
286 | 165 |
230 | 166 if subprocess.mswindows: |
167 try: | |
168 import win32clipboard | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
169 def get_paste_buffer(): |
230 | 170 win32clipboard.OpenClipboard(0) |
171 try: | |
172 result = win32clipboard.GetClipboardData() | |
173 except TypeError: | |
174 result = '' #non-text | |
175 win32clipboard.CloseClipboard() | |
176 return result | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
177 def write_to_paste_buffer(txt): |
230 | 178 win32clipboard.OpenClipboard(0) |
179 win32clipboard.EmptyClipboard() | |
180 win32clipboard.SetClipboardText(txt) | |
181 win32clipboard.CloseClipboard() | |
182 except ImportError: | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
183 def get_paste_buffer(*args): |
230 | 184 raise OSError, pastebufferr % ('pywin32', 'Download from http://sourceforge.net/projects/pywin32/') |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
185 setPasteBuffer = get_paste_buffer |
230 | 186 else: |
187 can_clip = False | |
188 try: | |
189 subprocess.check_call('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) | |
190 can_clip = True | |
191 except AttributeError: # check_call not defined, Python < 2.5 | |
192 teststring = 'Testing for presence of xclip.' | |
193 xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) | |
194 xclipproc.stdin.write(teststring) | |
195 xclipproc.stdin.close() | |
196 xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) | |
197 if xclipproc.stdout.read() == teststring: | |
198 can_clip = True | |
199 except (subprocess.CalledProcessError, OSError, IOError): | |
200 pass | |
201 if can_clip: | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
202 def get_paste_buffer(): |
230 | 203 xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) |
204 return xclipproc.stdout.read() | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
205 def write_to_paste_buffer(txt): |
230 | 206 xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) |
207 xclipproc.stdin.write(txt) | |
208 xclipproc.stdin.close() | |
209 # but we want it in both the "primary" and "mouse" clipboards | |
210 xclipproc = subprocess.Popen('xclip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) | |
211 xclipproc.stdin.write(txt) | |
212 xclipproc.stdin.close() | |
213 else: | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
214 def get_paste_buffer(*args): |
230 | 215 raise OSError, pastebufferr % ('xclip', 'On Debian/Ubuntu, install with "sudo apt-get install xclip"') |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
216 setPasteBuffer = get_paste_buffer |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
217 writeToPasteBuffer = get_paste_buffer |
230 | 218 |
219 pyparsing.ParserElement.setDefaultWhitespaceChars(' \t') | |
220 | |
221 class ParsedString(str): | |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
222 def full_parsed_statement(self): |
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
223 new = ParsedString('%s %s' % (self.parsed.command, self.parsed.args)) |
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
224 new.parsed = self.parsed |
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
225 new.parser = self.parser |
301 | 226 return new |
227 def with_args_replaced(self, newargs): | |
228 new = ParsedString(newargs) | |
229 new.parsed = self.parsed | |
230 new.parser = self.parser | |
231 new.parsed['args'] = newargs | |
232 new.parsed.statement['args'] = newargs | |
233 return new | |
230 | 234 |
235 class SkipToLast(pyparsing.SkipTo): | |
236 def parseImpl( self, instring, loc, doActions=True ): | |
237 resultStore = [] | |
238 startLoc = loc | |
239 instrlen = len(instring) | |
240 expr = self.expr | |
241 failParse = False | |
242 while loc <= instrlen: | |
243 try: | |
244 if self.failOn: | |
245 failParse = True | |
246 self.failOn.tryParse(instring, loc) | |
247 failParse = False | |
248 loc = expr._skipIgnorables( instring, loc ) | |
249 expr._parse( instring, loc, doActions=False, callPreParse=False ) | |
250 skipText = instring[startLoc:loc] | |
251 if self.includeMatch: | |
252 loc,mat = expr._parse(instring,loc,doActions,callPreParse=False) | |
253 if mat: | |
254 skipRes = ParseResults( skipText ) | |
255 skipRes += mat | |
256 resultStore.append((loc, [ skipRes ])) | |
257 else: | |
258 resultStore,append((loc, [ skipText ])) | |
259 else: | |
260 resultStore.append((loc, [ skipText ])) | |
261 loc += 1 | |
262 except (pyparsing.ParseException,IndexError): | |
263 if failParse: | |
264 raise | |
265 else: | |
266 loc += 1 | |
267 if resultStore: | |
268 return resultStore[-1] | |
269 else: | |
270 exc = self.myException | |
271 exc.loc = loc | |
272 exc.pstr = instring | |
273 raise exc | |
274 | |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
275 class StubbornDict(dict): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
276 '''Dictionary that tolerates many input formats. |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
277 Create it with stubbornDict(arg) factory function. |
319
c58cd7e48db7
begin to switch settable to TextLineList
catherine@dellzilla
parents:
317
diff
changeset
|
278 |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
279 >>> d = StubbornDict(large='gross', small='klein') |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
280 >>> sorted(d.items()) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
281 [('large', 'gross'), ('small', 'klein')] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
282 >>> d.append(['plain', ' plaid']) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
283 >>> sorted(d.items()) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
284 [('large', 'gross'), ('plaid', None), ('plain', None), ('small', 'klein')] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
285 >>> d += ' girl Frauelein, Maedchen\\n\\n shoe schuh' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
286 >>> sorted(d.items()) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
287 [('girl', 'Frauelein, Maedchen'), ('large', 'gross'), ('plaid', None), ('plain', None), ('shoe', 'schuh'), ('small', 'klein')] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
288 ''' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
289 def update(self, arg): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
290 dict.update(self, StubbornDict.to_dict(arg)) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
291 append = update |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
292 def __iadd__(self, arg): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
293 self.update(arg) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
294 return self |
323 | 295 def __add__(self, arg): |
296 selfcopy = copy.copy(self) | |
297 selfcopy.update(stubbornDict(arg)) | |
298 return selfcopy | |
299 def __radd__(self, arg): | |
300 selfcopy = copy.copy(self) | |
301 selfcopy.update(stubbornDict(arg)) | |
302 return selfcopy | |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
303 |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
304 @classmethod |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
305 def to_dict(cls, arg): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
306 'Generates dictionary from string or list of strings' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
307 if hasattr(arg, 'splitlines'): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
308 arg = arg.splitlines() |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
309 if hasattr(arg, '__getslice__'): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
310 result = {} |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
311 for a in arg: |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
312 a = a.strip() |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
313 if a: |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
314 key_val = a.split(None, 1) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
315 key = key_val[0] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
316 if len(key_val) > 1: |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
317 val = key_val[1] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
318 else: |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
319 val = '' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
320 result[key] = val |
319
c58cd7e48db7
begin to switch settable to TextLineList
catherine@dellzilla
parents:
317
diff
changeset
|
321 else: |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
322 result = arg |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
323 return result |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
324 |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
325 def stubbornDict(*arg, **kwarg): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
326 ''' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
327 >>> sorted(stubbornDict('cow a bovine\\nhorse an equine').items()) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
328 [('cow', 'a bovine'), ('horse', 'an equine')] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
329 >>> sorted(stubbornDict(['badger', 'porcupine a poky creature']).items()) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
330 [('badger', None), ('porcupine', 'a poky creature')] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
331 >>> sorted(stubbornDict(turtle='has shell', frog='jumpy').items()) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
332 [('frog', 'jumpy'), ('turtle', 'has shell')] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
333 ''' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
334 result = {} |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
335 for a in arg: |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
336 result.update(StubbornDict.to_dict(a)) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
337 result.update(kwarg) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
338 return StubbornDict(result) |
319
c58cd7e48db7
begin to switch settable to TextLineList
catherine@dellzilla
parents:
317
diff
changeset
|
339 |
230 | 340 def replace_with_file_contents(fname): |
341 if fname: | |
342 try: | |
343 result = open(os.path.expanduser(fname[0])).read() | |
344 except IOError: | |
345 result = '< %s' % fname[0] # wasn't a file after all | |
346 else: | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
347 result = get_paste_buffer() |
233 | 348 return result |
349 | |
234 | 350 class EmbeddedConsoleExit(Exception): |
351 pass | |
352 | |
235
78ad20c2eed0
py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents:
234
diff
changeset
|
353 class MyInteractiveConsole(InteractiveConsole): |
234 | 354 def runcode(self, code): |
355 """Execute a code object. | |
356 | |
357 When an exception occurs, self.showtraceback() is called to | |
358 display a traceback. All exceptions are caught except | |
359 SystemExit, which is reraised. | |
360 | |
361 A note about KeyboardInterrupt: this exception may occur | |
362 elsewhere in this code, and may not always be caught. The | |
363 caller should be prepared to deal with it. | |
364 | |
365 Copied directly from code.InteractiveInterpreter, except for | |
366 EmbeddedConsoleExit exceptions. | |
367 """ | |
368 try: | |
369 exec code in self.locals | |
370 except (SystemExit, EmbeddedConsoleExit): | |
371 raise | |
372 except: | |
373 self.showtraceback() | |
374 else: | |
235
78ad20c2eed0
py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents:
234
diff
changeset
|
375 if softspace(sys.stdout, 0): |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
376 print () |
234 | 377 |
290 | 378 def ljust(x, width, fillchar=' '): |
379 'analogous to str.ljust, but works for lists' | |
380 if hasattr(x, 'ljust'): | |
381 return x.ljust(width, fillchar) | |
382 else: | |
383 if len(x) < width: | |
384 x = (x + [fillchar] * width)[:width] | |
385 return x | |
386 | |
230 | 387 class Cmd(cmd.Cmd): |
388 echo = False | |
286 | 389 case_insensitive = True # Commands recognized regardless of case |
230 | 390 continuation_prompt = '> ' |
286 | 391 timing = False # Prints elapsed time for each command |
392 # make sure your terminators are not in legalChars! | |
393 legalChars = '!#$%.:?@_' + pyparsing.alphanums + pyparsing.alphas8bit | |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
394 shortcuts = {'?': 'help', '!': 'shell', '@': 'load', '@@': '_relative_load'} |
230 | 395 excludeFromHistory = '''run r list l history hi ed edit li eof'''.split() |
396 noSpecialParse = 'set ed edit exit'.split() | |
286 | 397 defaultExtension = 'txt' # For ``save``, ``load``, etc. |
398 default_file_name = 'command.txt' # For ``save``, ``load``, etc. | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
399 abbrev = True # Abbreviated commands recognized |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
400 current_script_dir = None |
245 | 401 reserved_words = [] |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
402 feedback_to_output = False # Do include nonessentials in >, | output |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
403 quiet = False # Do not suppress nonessential output |
324 | 404 debug = False |
328 | 405 locals_in_py = False |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
406 settable = stubbornDict(''' |
290 | 407 prompt |
312 | 408 colors Colorized output (*nix only) |
290 | 409 continuation_prompt |
410 debug | |
411 default_file_name for `save`, `load`, etc. | |
412 editor | |
413 case_insensitive upper- and lower-case both OK | |
414 feedback_to_output include nonessentials in `|`, `>` results | |
415 quiet | |
416 echo Echo command issued into output | |
417 timing Report execution times | |
418 abbrev Accept abbreviated commands | |
319
c58cd7e48db7
begin to switch settable to TextLineList
catherine@dellzilla
parents:
317
diff
changeset
|
419 ''') |
230 | 420 |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
421 def poutput(self, msg): |
284 | 422 if msg: |
423 self.stdout.write(msg) | |
424 if msg[-1] != '\n': | |
425 self.stdout.write('\n') | |
276 | 426 def perror(self, errmsg, statement=None): |
282 | 427 if self.debug: |
428 traceback.print_exc() | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
429 print str(errmsg) |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
430 def pfeedback(self, msg): |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
431 """For printing nonessential feedback. Can be silenced with `quiet`. |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
432 Inclusion in redirected output is controlled by `feedback_to_output`.""" |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
433 if not self.quiet: |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
434 if self.feedback_to_output: |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
435 self.poutput(msg) |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
436 else: |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
437 print (msg) |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
438 _STOP_AND_EXIT = 2 |
230 | 439 editor = os.environ.get('EDITOR') |
440 if not editor: | |
441 if sys.platform[:3] == 'win': | |
442 editor = 'notepad' | |
443 else: | |
444 for editor in ['gedit', 'kate', 'vim', 'emacs', 'nano', 'pico']: | |
445 if not os.system('which %s' % (editor)): | |
446 break | |
312 | 447 |
448 colorcodes = {'bold':{True:'\x1b[1m',False:'\x1b[22m'}, | |
449 'cyan':{True:'\x1b[36m',False:'\x1b[39m'}, | |
450 'blue':{True:'\x1b[34m',False:'\x1b[39m'}, | |
451 'red':{True:'\x1b[31m',False:'\x1b[39m'}, | |
452 'magenta':{True:'\x1b[35m',False:'\x1b[39m'}, | |
453 'green':{True:'\x1b[32m',False:'\x1b[39m'}, | |
454 'underline':{True:'\x1b[4m',False:'\x1b[24m'}} | |
455 colors = (platform.system() != 'Windows') | |
456 def colorize(self, val, color): | |
457 '''Wraps `val` in `color` markers (one of: red/blue/green/cyan/magenta, bold, underline), | |
458 but only if `colors` environment variable is True''' | |
459 if self.colors and (self.stdout == self.initial_stdout): | |
460 return self.colorcodes[color][True] + val + self.colorcodes[color][False] | |
461 return val | |
462 | |
230 | 463 def do_cmdenvironment(self, args): |
464 '''Summary report of interactive parameters.''' | |
465 self.stdout.write(""" | |
466 Commands are %(casesensitive)scase-sensitive. | |
467 Commands may be terminated with: %(terminators)s | |
237 | 468 Settable parameters: %(settable)s\n""" % \ |
230 | 469 { 'casesensitive': (self.case_insensitive and 'not ') or '', |
470 'terminators': str(self.terminators), | |
471 'settable': ' '.join(self.settable) | |
472 }) | |
473 | |
474 def do_help(self, arg): | |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
475 if arg: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
476 funcname = self.func_named(arg) |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
477 if funcname: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
478 fn = getattr(self, funcname) |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
479 try: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
480 fn.optionParser.print_help(file=self.stdout) |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
481 except AttributeError: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
482 cmd.Cmd.do_help(self, funcname[3:]) |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
483 else: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
484 cmd.Cmd.do_help(self, arg) |
230 | 485 |
486 def __init__(self, *args, **kwargs): | |
487 cmd.Cmd.__init__(self, *args, **kwargs) | |
271 | 488 self.initial_stdout = sys.stdout |
230 | 489 self.history = History() |
490 self._init_parser() | |
491 self.pystate = {} | |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
492 self.shortcuts = sorted(self.shortcuts.items(), reverse=True) |
247
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
493 self.keywords = self.reserved_words + [fname[3:] for fname in dir(self) |
290 | 494 if fname.startswith('do_')] |
317 | 495 def linelist(arg): |
496 result = [] | |
497 | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
498 self.doubleDashComment = pyparsing.NotAny(pyparsing.Or(options_defined)) + pyparsing.Literal('--') + pyparsing.restOfLine |
290 | 499 |
230 | 500 def do_shortcuts(self, args): |
501 """Lists single-key shortcuts available.""" | |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
502 result = "\n".join('%s: %s' % (sc[0], sc[1]) for sc in sorted(self.shortcuts)) |
230 | 503 self.stdout.write("Single-key shortcuts for other commands:\n%s\n" % (result)) |
504 | |
505 prefixParser = pyparsing.Empty() | |
506 commentGrammars = pyparsing.Or([pyparsing.pythonStyleComment, pyparsing.cStyleComment]) | |
507 commentGrammars.addParseAction(lambda x: '') | |
288
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
508 commentInProgress = pyparsing.Literal('/*') + pyparsing.SkipTo( |
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
509 pyparsing.stringEnd ^ '*/') |
230 | 510 terminators = [';'] |
511 blankLinesAllowed = False | |
512 multilineCommands = [] | |
513 | |
514 def _init_parser(self): | |
515 r''' | |
516 >>> c = Cmd() | |
517 >>> c.multilineCommands = ['multiline'] | |
518 >>> c.case_insensitive = True | |
519 >>> c._init_parser() | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
520 >>> print (c.parser.parseString('').dump()) |
313 | 521 [] |
522 >>> print (c.parser.parseString('').dump()) | |
230 | 523 [] |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
524 >>> print (c.parser.parseString('/* empty command */').dump()) |
230 | 525 [] |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
526 >>> print (c.parser.parseString('plainword').dump()) |
230 | 527 ['plainword', ''] |
528 - command: plainword | |
529 - statement: ['plainword', ''] | |
530 - command: plainword | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
531 >>> print (c.parser.parseString('termbare;').dump()) |
230 | 532 ['termbare', '', ';', ''] |
533 - command: termbare | |
534 - statement: ['termbare', '', ';'] | |
535 - command: termbare | |
536 - terminator: ; | |
537 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
538 >>> print (c.parser.parseString('termbare; suffx').dump()) |
230 | 539 ['termbare', '', ';', 'suffx'] |
540 - command: termbare | |
541 - statement: ['termbare', '', ';'] | |
542 - command: termbare | |
543 - terminator: ; | |
544 - suffix: suffx | |
545 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
546 >>> print (c.parser.parseString('barecommand').dump()) |
230 | 547 ['barecommand', ''] |
548 - command: barecommand | |
549 - statement: ['barecommand', ''] | |
550 - command: barecommand | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
551 >>> print (c.parser.parseString('COMmand with args').dump()) |
230 | 552 ['command', 'with args'] |
553 - args: with args | |
554 - command: command | |
555 - statement: ['command', 'with args'] | |
556 - args: with args | |
557 - command: command | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
558 >>> print (c.parser.parseString('command with args and terminator; and suffix').dump()) |
230 | 559 ['command', 'with args and terminator', ';', 'and suffix'] |
560 - args: with args and terminator | |
561 - command: command | |
562 - statement: ['command', 'with args and terminator', ';'] | |
563 - args: with args and terminator | |
564 - command: command | |
565 - terminator: ; | |
566 - suffix: and suffix | |
567 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
568 >>> print (c.parser.parseString('simple | piped').dump()) |
230 | 569 ['simple', '', '|', ' piped'] |
570 - command: simple | |
571 - pipeTo: piped | |
572 - statement: ['simple', ''] | |
573 - command: simple | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
574 >>> print (c.parser.parseString('double-pipe || is not a pipe').dump()) |
230 | 575 ['double', '-pipe || is not a pipe'] |
576 - args: -pipe || is not a pipe | |
577 - command: double | |
578 - statement: ['double', '-pipe || is not a pipe'] | |
579 - args: -pipe || is not a pipe | |
580 - command: double | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
581 >>> print (c.parser.parseString('command with args, terminator;sufx | piped').dump()) |
230 | 582 ['command', 'with args, terminator', ';', 'sufx', '|', ' piped'] |
583 - args: with args, terminator | |
584 - command: command | |
585 - pipeTo: piped | |
586 - statement: ['command', 'with args, terminator', ';'] | |
587 - args: with args, terminator | |
588 - command: command | |
589 - terminator: ; | |
590 - suffix: sufx | |
591 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
592 >>> print (c.parser.parseString('output into > afile.txt').dump()) |
230 | 593 ['output', 'into', '>', 'afile.txt'] |
594 - args: into | |
595 - command: output | |
596 - output: > | |
597 - outputTo: afile.txt | |
598 - statement: ['output', 'into'] | |
599 - args: into | |
600 - command: output | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
601 >>> print (c.parser.parseString('output into;sufx | pipethrume plz > afile.txt').dump()) |
230 | 602 ['output', 'into', ';', 'sufx', '|', ' pipethrume plz', '>', 'afile.txt'] |
603 - args: into | |
604 - command: output | |
605 - output: > | |
606 - outputTo: afile.txt | |
607 - pipeTo: pipethrume plz | |
608 - statement: ['output', 'into', ';'] | |
609 - args: into | |
610 - command: output | |
611 - terminator: ; | |
612 - suffix: sufx | |
613 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
614 >>> print (c.parser.parseString('output to paste buffer >> ').dump()) |
230 | 615 ['output', 'to paste buffer', '>>', ''] |
616 - args: to paste buffer | |
617 - command: output | |
618 - output: >> | |
619 - statement: ['output', 'to paste buffer'] | |
620 - args: to paste buffer | |
621 - command: output | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
622 >>> print (c.parser.parseString('ignore the /* commented | > */ stuff;').dump()) |
230 | 623 ['ignore', 'the /* commented | > */ stuff', ';', ''] |
624 - args: the /* commented | > */ stuff | |
625 - command: ignore | |
626 - statement: ['ignore', 'the /* commented | > */ stuff', ';'] | |
627 - args: the /* commented | > */ stuff | |
628 - command: ignore | |
629 - terminator: ; | |
630 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
631 >>> print (c.parser.parseString('has > inside;').dump()) |
230 | 632 ['has', '> inside', ';', ''] |
633 - args: > inside | |
634 - command: has | |
635 - statement: ['has', '> inside', ';'] | |
636 - args: > inside | |
637 - command: has | |
638 - terminator: ; | |
639 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
640 >>> print (c.parser.parseString('multiline has > inside an unfinished command').dump()) |
230 | 641 ['multiline', ' has > inside an unfinished command'] |
642 - multilineCommand: multiline | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
643 >>> print (c.parser.parseString('multiline has > inside;').dump()) |
230 | 644 ['multiline', 'has > inside', ';', ''] |
645 - args: has > inside | |
646 - multilineCommand: multiline | |
647 - statement: ['multiline', 'has > inside', ';'] | |
648 - args: has > inside | |
649 - multilineCommand: multiline | |
650 - terminator: ; | |
651 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
652 >>> print (c.parser.parseString('multiline command /* with comment in progress;').dump()) |
272 | 653 ['multiline', ' command'] |
654 - multilineCommand: multiline | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
655 >>> print (c.parser.parseString('multiline command /* with comment complete */ is done;').dump()) |
230 | 656 ['multiline', 'command /* with comment complete */ is done', ';', ''] |
657 - args: command /* with comment complete */ is done | |
658 - multilineCommand: multiline | |
659 - statement: ['multiline', 'command /* with comment complete */ is done', ';'] | |
660 - args: command /* with comment complete */ is done | |
661 - multilineCommand: multiline | |
662 - terminator: ; | |
663 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
664 >>> print (c.parser.parseString('multiline command ends\n\n').dump()) |
230 | 665 ['multiline', 'command ends', '\n', '\n'] |
666 - args: command ends | |
667 - multilineCommand: multiline | |
668 - statement: ['multiline', 'command ends', '\n', '\n'] | |
669 - args: command ends | |
670 - multilineCommand: multiline | |
671 - terminator: ['\n', '\n'] | |
672 - terminator: ['\n', '\n'] | |
673 ''' | |
288
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
674 tstr = 'multiline command /* with comment complete */ is done;' |
230 | 675 outputParser = (pyparsing.Literal('>>') | (pyparsing.WordStart() + '>') | pyparsing.Regex('[^=]>'))('output') |
676 | |
677 terminatorParser = pyparsing.Or([(hasattr(t, 'parseString') and t) or pyparsing.Literal(t) for t in self.terminators])('terminator') | |
678 stringEnd = pyparsing.stringEnd ^ '\nEOF' | |
679 self.multilineCommand = pyparsing.Or([pyparsing.Keyword(c, caseless=self.case_insensitive) for c in self.multilineCommands])('multilineCommand') | |
680 oneLineCommand = (~self.multilineCommand + pyparsing.Word(self.legalChars))('command') | |
681 pipe = pyparsing.Keyword('|', identChars='|') | |
285 | 682 self.commentGrammars.ignore(pyparsing.quotedString).setParseAction(lambda x: '') |
230 | 683 afterElements = \ |
684 pyparsing.Optional(pipe + pyparsing.SkipTo(outputParser ^ stringEnd)('pipeTo')) + \ | |
685 pyparsing.Optional(outputParser + pyparsing.SkipTo(stringEnd).setParseAction(lambda x: x[0].strip())('outputTo')) | |
686 if self.case_insensitive: | |
687 self.multilineCommand.setParseAction(lambda x: x[0].lower()) | |
688 oneLineCommand.setParseAction(lambda x: x[0].lower()) | |
689 if self.blankLinesAllowed: | |
690 self.blankLineTerminationParser = pyparsing.NoMatch | |
691 else: | |
692 self.blankLineTerminator = (pyparsing.lineEnd + pyparsing.lineEnd)('terminator') | |
693 self.blankLineTerminator.setResultsName('terminator') | |
694 self.blankLineTerminationParser = ((self.multilineCommand ^ oneLineCommand) + pyparsing.SkipTo(self.blankLineTerminator).setParseAction(lambda x: x[0].strip())('args') + self.blankLineTerminator)('statement') | |
695 self.multilineParser = (((self.multilineCommand ^ oneLineCommand) + SkipToLast(terminatorParser).setParseAction(lambda x: x[0].strip())('args') + terminatorParser)('statement') + | |
696 pyparsing.SkipTo(outputParser ^ pipe ^ stringEnd).setParseAction(lambda x: x[0].strip())('suffix') + afterElements) | |
250 | 697 self.multilineParser.ignore(self.commentInProgress) |
230 | 698 self.singleLineParser = ((oneLineCommand + pyparsing.SkipTo(terminatorParser ^ stringEnd ^ pipe ^ outputParser).setParseAction(lambda x:x[0].strip())('args'))('statement') + |
699 pyparsing.Optional(terminatorParser) + afterElements) | |
288
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
700 #self.multilineParser = self.multilineParser.setResultsName('multilineParser') |
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
701 #self.singleLineParser = self.singleLineParser.setResultsName('singleLineParser') |
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
702 self.blankLineTerminationParser = self.blankLineTerminationParser.setResultsName('statement') |
266
584f970ca66a
permit bare prefix
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
703 self.parser = self.prefixParser + ( |
230 | 704 stringEnd | |
266
584f970ca66a
permit bare prefix
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
705 self.multilineParser | |
584f970ca66a
permit bare prefix
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
706 self.singleLineParser | |
584f970ca66a
permit bare prefix
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
707 self.blankLineTerminationParser | |
584f970ca66a
permit bare prefix
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
708 self.multilineCommand + pyparsing.SkipTo(stringEnd) |
230 | 709 ) |
249
55a12d77a4fa
finally, ls working right
catherine@Elli.myhome.westell.com
parents:
248
diff
changeset
|
710 self.parser.ignore(pyparsing.quotedString).ignore(self.commentGrammars) |
230 | 711 |
712 inputMark = pyparsing.Literal('<') | |
713 inputMark.setParseAction(lambda x: '') | |
714 fileName = pyparsing.Word(self.legalChars + '/\\') | |
715 inputFrom = fileName('inputFrom') | |
716 inputFrom.setParseAction(replace_with_file_contents) | |
717 # a not-entirely-satisfactory way of distinguishing < as in "import from" from < | |
718 # as in "lesser than" | |
719 self.inputParser = inputMark + pyparsing.Optional(inputFrom) + pyparsing.Optional('>') + \ | |
720 pyparsing.Optional(fileName) + (pyparsing.stringEnd | '|') | |
721 self.inputParser.ignore(pyparsing.quotedString).ignore(self.commentGrammars).ignore(self.commentInProgress) | |
722 | |
723 def preparse(self, raw, **kwargs): | |
724 return raw | |
725 | |
726 def parsed(self, raw, **kwargs): | |
727 if isinstance(raw, ParsedString): | |
728 p = raw | |
729 else: | |
292 | 730 # preparse is an overridable hook; default makes no changes |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
731 s = self.preparse(raw, **kwargs) |
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
732 s = self.inputParser.transformString(s.lstrip()) |
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
733 s = self.commentGrammars.transformString(s) |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
734 for (shortcut, expansion) in self.shortcuts: |
230 | 735 if s.lower().startswith(shortcut): |
736 s = s.replace(shortcut, expansion + ' ', 1) | |
737 break | |
738 result = self.parser.parseString(s) | |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
739 result['raw'] = raw |
230 | 740 result['command'] = result.multilineCommand or result.command |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
741 p = ParsedString(result.args) |
230 | 742 p.parsed = result |
295 | 743 p.parser = self.parsed |
230 | 744 for (key, val) in kwargs.items(): |
745 p.parsed[key] = val | |
746 return p | |
747 | |
748 def postparsing_precmd(self, statement): | |
749 stop = 0 | |
750 return stop, statement | |
247
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
751 |
230 | 752 def postparsing_postcmd(self, stop): |
753 return stop | |
247
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
754 def func_named(self, arg): |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
755 result = None |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
756 target = 'do_' + arg |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
757 if target in dir(self): |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
758 result = target |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
759 else: |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
760 if self.abbrev: # accept shortened versions of commands |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
761 funcs = [fname for fname in self.keywords if fname.startswith(arg)] |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
762 if len(funcs) == 1: |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
763 result = 'do_' + funcs[0] |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
764 return result |
230 | 765 def onecmd(self, line): |
766 """Interpret the argument as though it had been typed in response | |
767 to the prompt. | |
768 | |
769 This may be overridden, but should not normally need to be; | |
770 see the precmd() and postcmd() methods for useful execution hooks. | |
771 The return value is a flag indicating whether interpretation of | |
772 commands by the interpreter should stop. | |
773 | |
774 This (`cmd2`) version of `onecmd` already override's `cmd`'s `onecmd`. | |
775 | |
776 """ | |
777 if not line: | |
778 return self.emptyline() | |
779 if not pyparsing.Or(self.commentGrammars).setParseAction(lambda x: '').transformString(line): | |
780 return 0 # command was empty except for comments | |
781 try: | |
782 statement = self.parsed(line) | |
783 while statement.parsed.multilineCommand and (statement.parsed.terminator == ''): | |
784 statement = '%s\n%s' % (statement.parsed.raw, | |
785 self.pseudo_raw_input(self.continuation_prompt)) | |
786 statement = self.parsed(statement) | |
787 except Exception, e: | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
788 self.perror(e) |
230 | 789 return 0 |
246 | 790 if statement.parsed.command not in self.excludeFromHistory: |
791 self.history.append(statement.parsed.raw) | |
230 | 792 try: |
793 (stop, statement) = self.postparsing_precmd(statement) | |
794 except Exception, e: | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
795 self.perror(e) |
230 | 796 return 0 |
797 if stop: | |
798 return self.postparsing_postcmd(stop) | |
799 | |
800 if not statement.parsed.command: | |
801 return self.postparsing_postcmd(stop=0) | |
802 | |
803 statekeeper = None | |
804 | |
805 if statement.parsed.pipeTo: | |
806 redirect = subprocess.Popen(statement.parsed.pipeTo, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) | |
807 statekeeper = Statekeeper(self, ('stdout',)) | |
808 self.stdout = redirect.stdin | |
809 elif statement.parsed.output: | |
810 statekeeper = Statekeeper(self, ('stdout',)) | |
811 if statement.parsed.outputTo: | |
812 mode = 'w' | |
813 if statement.parsed.output == '>>': | |
814 mode = 'a' | |
815 try: | |
816 self.stdout = open(os.path.expanduser(statement.parsed.outputTo), mode) | |
282 | 817 except Exception, e: |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
818 self.perror(e) |
230 | 819 return self.postparsing_postcmd(stop=0) |
820 else: | |
821 statekeeper = Statekeeper(self, ('stdout',)) | |
822 self.stdout = tempfile.TemporaryFile() | |
823 if statement.parsed.output == '>>': | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
824 self.stdout.write(get_paste_buffer()) |
230 | 825 try: |
251 | 826 try: |
292 | 827 # "heart" of the command, replaces cmd's onecmd() |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
828 self.lastcmd = statement.parsed.raw |
275 | 829 funcname = self.func_named(statement.parsed.command) |
830 if not funcname: | |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
831 return self.postparsing_postcmd(self.default(statement.full_parsed_statement())) |
275 | 832 try: |
833 func = getattr(self, funcname) | |
834 except AttributeError: | |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
835 return self.postparsing_postcmd(self.default(statement.full_parsed_statement())) |
275 | 836 timestart = datetime.datetime.now() |
837 stop = func(statement) | |
838 if self.timing: | |
839 self.pfeedback('Elapsed: %s' % str(datetime.datetime.now() - timestart)) | |
840 except Exception, e: | |
276 | 841 self.perror(e, statement) |
230 | 842 finally: |
843 if statekeeper: | |
844 if statement.parsed.output and not statement.parsed.outputTo: | |
845 self.stdout.seek(0) | |
846 try: | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
847 write_to_paste_buffer(self.stdout.read()) |
230 | 848 except Exception, e: |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
849 self.perror(e) |
230 | 850 elif statement.parsed.pipeTo: |
851 for result in redirect.communicate(): | |
852 statekeeper.stdout.write(result or '') | |
853 self.stdout.close() | |
854 statekeeper.restore() | |
855 | |
856 return self.postparsing_postcmd(stop) | |
857 | |
858 def pseudo_raw_input(self, prompt): | |
859 """copied from cmd's cmdloop; like raw_input, but accounts for changed stdin, stdout""" | |
860 | |
861 if self.use_rawinput: | |
862 try: | |
863 line = raw_input(prompt) | |
864 except EOFError: | |
865 line = 'EOF' | |
866 else: | |
867 self.stdout.write(prompt) | |
868 self.stdout.flush() | |
869 line = self.stdin.readline() | |
870 if not len(line): | |
871 line = 'EOF' | |
872 else: | |
873 if line[-1] == '\n': # this was always true in Cmd | |
874 line = line[:-1] | |
875 return line | |
282 | 876 |
230 | 877 def cmdloop(self, intro=None): |
878 """Repeatedly issue a prompt, accept input, parse an initial prefix | |
879 off the received input, and dispatch to action methods, passing them | |
880 the remainder of the line as argument. | |
881 """ | |
882 | |
883 # An almost perfect copy from Cmd; however, the pseudo_raw_input portion | |
884 # has been split out so that it can be called separately | |
885 | |
886 self.preloop() | |
887 if self.use_rawinput and self.completekey: | |
888 try: | |
889 import readline | |
890 self.old_completer = readline.get_completer() | |
891 readline.set_completer(self.complete) | |
892 readline.parse_and_bind(self.completekey+": complete") | |
893 except ImportError: | |
894 pass | |
895 try: | |
896 if intro is not None: | |
897 self.intro = intro | |
898 if self.intro: | |
899 self.stdout.write(str(self.intro)+"\n") | |
900 stop = None | |
901 while not stop: | |
902 if self.cmdqueue: | |
903 line = self.cmdqueue.pop(0) | |
904 else: | |
905 line = self.pseudo_raw_input(self.prompt) | |
906 if (self.echo) and (isinstance(self.stdin, file)): | |
907 self.stdout.write(line + '\n') | |
908 line = self.precmd(line) | |
909 stop = self.onecmd(line) | |
910 stop = self.postcmd(stop, line) | |
911 self.postloop() | |
912 finally: | |
913 if self.use_rawinput and self.completekey: | |
914 try: | |
915 import readline | |
916 readline.set_completer(self.old_completer) | |
917 except ImportError: | |
918 pass | |
919 return stop | |
920 | |
921 def do_EOF(self, arg): | |
922 return True | |
923 do_eof = do_EOF | |
290 | 924 |
230 | 925 def do_quit(self, arg): |
926 return self._STOP_AND_EXIT | |
927 do_exit = do_quit | |
928 do_q = do_quit | |
929 | |
309 | 930 def select(self, options, prompt='Your choice? '): |
931 '''Presents a numbered menu to the user. Modelled after | |
310 | 932 the bash shell's SELECT. Returns the item chosen. |
933 | |
934 Argument ``options`` can be: | |
935 a single string -> will be split into one-word options | |
936 a list of strings -> will be offered as options | |
937 a list of tuples -> interpreted as (value, text), so | |
938 that the return value can differ from | |
939 the text advertised to the user ''' | |
309 | 940 if isinstance(options, basestring): |
310 | 941 options = zip(options.split(), options.split()) |
942 fulloptions = [] | |
943 for opt in options: | |
944 if isinstance(opt, basestring): | |
945 fulloptions.append((opt, opt)) | |
946 else: | |
947 try: | |
948 fulloptions.append((opt[0], opt[1])) | |
949 except IndexError: | |
950 fulloptions.append((opt[0], opt[0])) | |
951 for (idx, (value, text)) in enumerate(fulloptions): | |
952 self.poutput(' %2d. %s\n' % (idx+1, text)) | |
309 | 953 while True: |
954 response = raw_input(prompt) | |
955 try: | |
956 response = int(response) | |
310 | 957 result = fulloptions[response - 1][0] |
309 | 958 break |
959 except ValueError: | |
960 pass # loop and ask again | |
961 return result | |
962 | |
290 | 963 @options([make_option('-l', '--long', action="store_true", |
964 help="describe function of parameter")]) | |
965 def do_show(self, arg, opts): | |
230 | 966 '''Shows value of a parameter.''' |
290 | 967 param = arg.strip().lower() |
968 result = {} | |
969 maxlen = 0 | |
970 for p in self.settable: | |
971 if (not param) or p.startswith(param): | |
972 result[p] = '%s: %s' % (p, str(getattr(self, p))) | |
973 maxlen = max(maxlen, len(result[p])) | |
974 if result: | |
975 for p in sorted(result): | |
976 if opts.long: | |
977 self.poutput('%s # %s' % (result[p].ljust(maxlen), self.settable[p])) | |
978 else: | |
979 self.poutput(result[p]) | |
230 | 980 else: |
290 | 981 self.perror("Parameter '%s' not supported (type 'show' for list of parameters)." % param) |
230 | 982 |
983 def do_set(self, arg): | |
290 | 984 ''' |
985 Sets a cmd2 parameter. Accepts abbreviated parameter names so long | |
986 as there is no ambiguity. Call without arguments for a list of | |
987 settable parameters with their values.''' | |
230 | 988 try: |
291 | 989 statement, paramName, val = arg.parsed.raw.split(None, 2) |
230 | 990 paramName = paramName.strip().lower() |
290 | 991 if paramName not in self.settable: |
291 | 992 hits = [p for p in self.settable if p.startswith(paramName)] |
290 | 993 if len(hits) == 1: |
994 paramName = hits[0] | |
995 else: | |
996 return self.do_show(paramName) | |
997 currentVal = getattr(self, paramName) | |
998 if (val[0] == val[-1]) and val[0] in ("'", '"'): | |
999 val = val[1:-1] | |
1000 else: | |
1001 val = cast(currentVal, val) | |
1002 setattr(self, paramName, val) | |
1003 self.stdout.write('%s - was: %s\nnow: %s\n' % (paramName, currentVal, val)) | |
1004 if currentVal != val: | |
1005 try: | |
1006 onchange_hook = getattr(self, '_onchange_%s' % paramName) | |
1007 onchange_hook(old=currentVal, new=val) | |
1008 except AttributeError: | |
1009 pass | |
230 | 1010 except (ValueError, AttributeError, NotSettableError), e: |
1011 self.do_show(arg) | |
1012 | |
1013 def do_pause(self, arg): | |
1014 'Displays the specified text then waits for the user to press RETURN.' | |
1015 raw_input(arg + '\n') | |
1016 | |
1017 def do_shell(self, arg): | |
1018 'execute a command as if at the OS prompt.' | |
1019 os.system(arg) | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1020 |
233 | 1021 def do_py(self, arg): |
230 | 1022 ''' |
1023 py <command>: Executes a Python command. | |
242 | 1024 py: Enters interactive Python mode. |
1025 End with `Ctrl-D` (Unix) / `Ctrl-Z` (Windows), `quit()`, 'exit()`. | |
241 | 1026 Non-python commands can be issued with `cmd("your command")`. |
230 | 1027 ''' |
280 | 1028 self.pystate['self'] = self |
274 | 1029 arg = arg.parsed.raw[2:].strip() |
230 | 1030 if arg.strip(): |
235
78ad20c2eed0
py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents:
234
diff
changeset
|
1031 interp = InteractiveInterpreter(locals=self.pystate) |
233 | 1032 interp.runcode(arg) |
230 | 1033 else: |
328 | 1034 localvars = (self.locals_in_py and self.pystate) or {} |
1035 interp = MyInteractiveConsole(locals=localvars) | |
233 | 1036 def quit(): |
328 | 1037 'blah' |
234 | 1038 raise EmbeddedConsoleExit |
236 | 1039 def onecmd(arg): |
1040 return self.onecmd(arg + '\n') | |
233 | 1041 self.pystate['quit'] = quit |
1042 self.pystate['exit'] = quit | |
328 | 1043 self.pystate['cmd'] = onecmd |
234 | 1044 try: |
240 | 1045 cprt = 'Type "help", "copyright", "credits" or "license" for more information.' |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1046 keepstate = Statekeeper(sys, ('stdin','stdout')) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1047 sys.stdout = self.stdout |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1048 sys.stdin = self.stdin |
240 | 1049 interp.interact(banner= "Python %s on %s\n%s\n(%s)\n%s" % |
1050 (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
|
1051 except EmbeddedConsoleExit: |
245 | 1052 pass |
1053 keepstate.restore() | |
233 | 1054 |
230 | 1055 def do_history(self, arg): |
1056 """history [arg]: lists past commands issued | |
1057 | |
314 | 1058 | no arg: list all |
1059 | arg is integer: list one history item, by index | |
1060 | arg is string: string search | |
1061 | arg is /enclosed in forward-slashes/: regular expression search | |
230 | 1062 """ |
1063 if arg: | |
1064 history = self.history.get(arg) | |
1065 else: | |
1066 history = self.history | |
1067 for hi in history: | |
1068 self.stdout.write(hi.pr()) | |
1069 def last_matching(self, arg): | |
1070 try: | |
1071 if arg: | |
1072 return self.history.get(arg)[-1] | |
1073 else: | |
1074 return self.history[-1] | |
1075 except IndexError: | |
1076 return None | |
1077 def do_list(self, arg): | |
1078 """list [arg]: lists last command issued | |
1079 | |
307 | 1080 no arg -> list most recent command |
230 | 1081 arg is integer -> list one history item, by index |
307 | 1082 a..b, a:b, a:, ..b -> list spans from a (or start) to b (or end) |
308 | 1083 arg is string -> list all commands matching string search |
230 | 1084 arg is /enclosed in forward-slashes/ -> regular expression search |
1085 """ | |
1086 try: | |
308 | 1087 history = self.history.span(arg or '-1') |
1088 except IndexError: | |
1089 history = self.history.search(arg) | |
1090 for hi in history: | |
1091 self.poutput(hi.pr()) | |
1092 | |
230 | 1093 do_hi = do_history |
1094 do_l = do_list | |
1095 do_li = do_list | |
1096 | |
1097 def do_ed(self, arg): | |
1098 """ed: edit most recent command in text editor | |
1099 ed [N]: edit numbered command from history | |
1100 ed [filename]: edit specified file name | |
1101 | |
1102 commands are run after editor is closed. | |
1103 "set edit (program-name)" or set EDITOR environment variable | |
1104 to control which editing program is used.""" | |
1105 if not self.editor: | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1106 self.perror("Please use 'set editor' to specify your text editing program of choice.") |
230 | 1107 return |
1108 filename = self.default_file_name | |
1109 if arg: | |
1110 try: | |
1111 buffer = self.last_matching(int(arg)) | |
1112 except ValueError: | |
1113 filename = arg | |
1114 buffer = '' | |
1115 else: | |
1116 buffer = self.history[-1] | |
1117 | |
1118 if buffer: | |
1119 f = open(os.path.expanduser(filename), 'w') | |
1120 f.write(buffer or '') | |
1121 f.close() | |
1122 | |
1123 os.system('%s %s' % (self.editor, filename)) | |
1124 self.do__load(filename) | |
1125 do_edit = do_ed | |
1126 | |
1127 saveparser = (pyparsing.Optional(pyparsing.Word(pyparsing.nums)^'*')("idx") + | |
1128 pyparsing.Optional(pyparsing.Word(legalChars + '/\\'))("fname") + | |
1129 pyparsing.stringEnd) | |
1130 def do_save(self, arg): | |
1131 """`save [N] [filename.ext]` | |
1132 Saves command from history to file. | |
1133 N => Number of command (from history), or `*`; | |
1134 most recent command if omitted""" | |
1135 | |
1136 try: | |
1137 args = self.saveparser.parseString(arg) | |
1138 except pyparsing.ParseException: | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1139 self.perror(self.do_save.__doc__) |
230 | 1140 return |
1141 fname = args.fname or self.default_file_name | |
1142 if args.idx == '*': | |
1143 saveme = '\n\n'.join(self.history[:]) | |
1144 elif args.idx: | |
1145 saveme = self.history[int(args.idx)-1] | |
1146 else: | |
1147 saveme = self.history[-1] | |
1148 try: | |
1149 f = open(os.path.expanduser(fname), 'w') | |
1150 f.write(saveme) | |
1151 f.close() | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1152 self.pfeedback('Saved to %s' % (fname)) |
230 | 1153 except Exception, e: |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1154 self.perror('Error saving %s: %s' % (fname, str(e))) |
230 | 1155 |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1156 def read_file_or_url(self, fname): |
288
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
1157 # TODO: not working on localhost |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1158 if isinstance(fname, file): |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
1159 result = open(fname, 'r') |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1160 else: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1161 match = self.urlre.match(fname) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1162 if match: |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
1163 result = urllib.urlopen(match.group(1)) |
230 | 1164 else: |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1165 fname = os.path.expanduser(fname) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1166 try: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1167 result = open(os.path.expanduser(fname), 'r') |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
1168 except IOError: |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1169 result = open('%s.%s' % (os.path.expanduser(fname), |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1170 self.defaultExtension), 'r') |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1171 return result |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1172 |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1173 def do__relative_load(self, arg=None): |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1174 ''' |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1175 Runs commands in script at file or URL; if this is called from within an |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1176 already-running script, the filename will be interpreted relative to the |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1177 already-running script's directory.''' |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1178 if arg: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1179 arg = arg.split(None, 1) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1180 targetname, args = arg[0], (arg[1:] or [''])[0] |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1181 targetname = os.path.join(self.current_script_dir or '', targetname) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1182 self.do__load('%s %s' % (targetname, args)) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1183 |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1184 urlre = re.compile('(https?://[-\\w\\./]+)') |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1185 def do_load(self, arg=None): |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1186 """Runs script of command(s) from a file or URL.""" |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1187 if arg is None: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1188 targetname = self.default_file_name |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1189 else: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1190 arg = arg.split(None, 1) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1191 targetname, args = arg[0], (arg[1:] or [''])[0].strip() |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1192 try: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1193 target = self.read_file_or_url(targetname) |
230 | 1194 except IOError, e: |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1195 self.perror('Problem accessing script from %s: \n%s' % (targetname, e)) |
230 | 1196 return |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1197 keepstate = Statekeeper(self, ('stdin','use_rawinput','prompt', |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1198 'continuation_prompt','current_script_dir')) |
230 | 1199 self.stdin = target |
1200 self.use_rawinput = False | |
1201 self.prompt = self.continuation_prompt = '' | |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1202 self.current_script_dir = os.path.split(targetname)[0] |
230 | 1203 stop = self.cmdloop() |
1204 self.stdin.close() | |
1205 keepstate.restore() | |
1206 self.lastcmd = '' | |
1207 return (stop == self._STOP_AND_EXIT) and self._STOP_AND_EXIT | |
1208 do__load = do_load # avoid an unfortunate legacy use of do_load from sqlpython | |
1209 | |
1210 def do_run(self, arg): | |
1211 """run [arg]: re-runs an earlier command | |
1212 | |
1213 no arg -> run most recent command | |
1214 arg is integer -> run one history item, by index | |
1215 arg is string -> run most recent command by string search | |
1216 arg is /enclosed in forward-slashes/ -> run most recent by regex | |
1217 """ | |
1218 'run [N]: runs the SQL that was run N commands ago' | |
1219 runme = self.last_matching(arg) | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1220 self.pfeedback(runme) |
230 | 1221 if runme: |
1222 runme = self.precmd(runme) | |
1223 stop = self.onecmd(runme) | |
1224 stop = self.postcmd(stop, runme) | |
1225 do_r = do_run | |
1226 | |
1227 def fileimport(self, statement, source): | |
1228 try: | |
1229 f = open(os.path.expanduser(source)) | |
1230 except IOError: | |
1231 self.stdout.write("Couldn't read from file %s\n" % source) | |
1232 return '' | |
1233 data = f.read() | |
1234 f.close() | |
1235 return data | |
1236 | |
1237 class HistoryItem(str): | |
305 | 1238 listformat = '-------------------------[%d]\n%s\n' |
230 | 1239 def __init__(self, instr): |
1240 str.__init__(self) | |
1241 self.lowercase = self.lower() | |
1242 self.idx = None | |
1243 def pr(self): | |
307 | 1244 return self.listformat % (self.idx, str(self)) |
230 | 1245 |
1246 class History(list): | |
305 | 1247 '''A list of HistoryItems that knows how to respond to user requests. |
1248 >>> h = History([HistoryItem('first'), HistoryItem('second'), HistoryItem('third'), HistoryItem('fourth')]) | |
1249 >>> h.span('-2..') | |
1250 ['third', 'fourth'] | |
1251 >>> h.span('2..3') | |
1252 ['second', 'third'] | |
1253 >>> h.span('3') | |
1254 ['third'] | |
1255 >>> h.span(':') | |
1256 ['first', 'second', 'third', 'fourth'] | |
1257 >>> h.span('2..') | |
1258 ['second', 'third', 'fourth'] | |
1259 >>> h.span('-1') | |
1260 ['fourth'] | |
1261 >>> h.span('-2..-3') | |
306 | 1262 ['third', 'second'] |
308 | 1263 >>> h.search('o') |
1264 ['second', 'fourth'] | |
1265 >>> h.search('/IR/') | |
1266 ['first', 'third'] | |
305 | 1267 ''' |
1268 def zero_based_index(self, onebased): | |
1269 result = onebased | |
1270 if result > 0: | |
1271 result -= 1 | |
1272 return result | |
1273 def to_index(self, raw): | |
1274 if raw: | |
1275 result = self.zero_based_index(int(raw)) | |
1276 else: | |
1277 result = None | |
1278 return result | |
308 | 1279 def search(self, target): |
1280 target = target.strip() | |
1281 if target[0] == target[-1] == '/' and len(target) > 1: | |
1282 target = target[1:-1] | |
1283 else: | |
1284 target = re.escape(target) | |
1285 pattern = re.compile(target, re.IGNORECASE) | |
1286 return [s for s in self if pattern.search(s)] | |
305 | 1287 spanpattern = re.compile(r'^\s*(?P<start>\-?\d+)?\s*(?P<separator>:|(\.{2,}))?\s*(?P<end>\-?\d+)?\s*$') |
1288 def span(self, raw): | |
308 | 1289 if raw.lower() in ('*', '-', 'all'): |
1290 raw = ':' | |
305 | 1291 results = self.spanpattern.search(raw) |
307 | 1292 if not results: |
1293 raise IndexError | |
305 | 1294 if not results.group('separator'): |
1295 return [self[self.to_index(results.group('start'))]] | |
1296 start = self.to_index(results.group('start')) | |
1297 end = self.to_index(results.group('end')) | |
1298 reverse = False | |
1299 if end is not None: | |
1300 if end < start: | |
1301 (start, end) = (end, start) | |
1302 reverse = True | |
1303 end += 1 | |
1304 result = self[start:end] | |
1305 if reverse: | |
1306 result.reverse() | |
1307 return result | |
1308 | |
1309 rangePattern = re.compile(r'^\s*(?P<start>[\d]+)?\s*\-\s*(?P<end>[\d]+)?\s*$') | |
230 | 1310 def append(self, new): |
1311 new = HistoryItem(new) | |
1312 list.append(self, new) | |
1313 new.idx = len(self) | |
1314 def extend(self, new): | |
1315 for n in new: | |
1316 self.append(n) | |
305 | 1317 |
1318 | |
1319 def get(self, getme=None, fromEnd=False): | |
1320 if not getme: | |
1321 return self | |
230 | 1322 try: |
1323 getme = int(getme) | |
1324 if getme < 0: | |
1325 return self[:(-1 * getme)] | |
1326 else: | |
1327 return [self[getme-1]] | |
1328 except IndexError: | |
1329 return [] | |
305 | 1330 except ValueError: |
1331 rangeResult = self.rangePattern.search(getme) | |
1332 if rangeResult: | |
1333 start = rangeResult.group('start') or None | |
1334 end = rangeResult.group('start') or None | |
1335 if start: | |
1336 start = int(start) - 1 | |
1337 if end: | |
1338 end = int(end) | |
1339 return self[start:end] | |
1340 | |
230 | 1341 getme = getme.strip() |
305 | 1342 |
230 | 1343 if getme.startswith(r'/') and getme.endswith(r'/'): |
1344 finder = re.compile(getme[1:-1], re.DOTALL | re.MULTILINE | re.IGNORECASE) | |
1345 def isin(hi): | |
1346 return finder.search(hi) | |
1347 else: | |
1348 def isin(hi): | |
1349 return (getme.lower() in hi.lowercase) | |
1350 return [itm for itm in self if isin(itm)] | |
1351 | |
1352 class NotSettableError(Exception): | |
1353 pass | |
1354 | |
1355 def cast(current, new): | |
1356 """Tries to force a new value into the same type as the current.""" | |
1357 typ = type(current) | |
1358 if typ == bool: | |
1359 try: | |
1360 return bool(int(new)) | |
1361 except ValueError, TypeError: | |
1362 pass | |
1363 try: | |
1364 new = new.lower() | |
1365 except: | |
1366 pass | |
1367 if (new=='on') or (new[0] in ('y','t')): | |
1368 return True | |
1369 if (new=='off') or (new[0] in ('n','f')): | |
1370 return False | |
1371 else: | |
1372 try: | |
1373 return typ(new) | |
1374 except: | |
1375 pass | |
1376 print "Problem setting parameter (now %s) to %s; incorrect type?" % (current, new) | |
1377 return current | |
1378 | |
1379 class Statekeeper(object): | |
1380 def __init__(self, obj, attribs): | |
1381 self.obj = obj | |
1382 self.attribs = attribs | |
282 | 1383 if self.obj: |
1384 self.save() | |
230 | 1385 def save(self): |
1386 for attrib in self.attribs: | |
1387 setattr(self, attrib, getattr(self.obj, attrib)) | |
1388 def restore(self): | |
282 | 1389 if self.obj: |
1390 for attrib in self.attribs: | |
1391 setattr(self.obj, attrib, getattr(self, attrib)) | |
230 | 1392 |
1393 class Borg(object): | |
1394 '''All instances of any Borg subclass will share state. | |
1395 from Python Cookbook, 2nd Ed., recipe 6.16''' | |
1396 _shared_state = {} | |
1397 def __new__(cls, *a, **k): | |
1398 obj = object.__new__(cls, *a, **k) | |
1399 obj.__dict__ = cls._shared_state | |
1400 return obj | |
1401 | |
1402 class OutputTrap(Borg): | |
1403 '''Instantiate an OutputTrap to divert/capture ALL stdout output. For use in unit testing. | |
1404 Call `tearDown()` to return to normal output.''' | |
1405 def __init__(self): | |
1406 self.old_stdout = sys.stdout | |
1407 self.trap = tempfile.TemporaryFile() | |
1408 sys.stdout = self.trap | |
1409 def read(self): | |
1410 self.trap.seek(0) | |
1411 result = self.trap.read() | |
1412 self.trap.truncate(0) | |
1413 return result.strip('\x00') | |
1414 def tearDown(self): | |
1415 sys.stdout = self.old_stdout | |
1416 | |
261
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1417 |
230 | 1418 class Cmd2TestCase(unittest.TestCase): |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1419 '''Subclass this, setting CmdApp, to make a unittest.TestCase class |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1420 that will execute the commands in a transcript file and expect the results shown. |
230 | 1421 See example.py''' |
1422 CmdApp = None | |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1423 def fetchTranscripts(self): |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1424 self.transcripts = {} |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1425 for fileset in self.CmdApp.testfiles: |
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1426 for fname in glob.glob(fileset): |
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1427 tfile = open(fname) |
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1428 self.transcripts[fname] = iter(tfile.readlines()) |
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1429 tfile.close() |
260
2b69c4d72cd8
unfinished experiments with testing for regular expressions
Catherine Devlin <catherine.devlin@gmail.com>
parents:
259
diff
changeset
|
1430 if not len(self.transcripts): |
2b69c4d72cd8
unfinished experiments with testing for regular expressions
Catherine Devlin <catherine.devlin@gmail.com>
parents:
259
diff
changeset
|
1431 raise StandardError, "No test files found - nothing to test." |
230 | 1432 def setUp(self): |
1433 if self.CmdApp: | |
1434 self.outputTrap = OutputTrap() | |
1435 self.cmdapp = self.CmdApp() | |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1436 self.fetchTranscripts() |
326 | 1437 def runTest(self): # was testall |
230 | 1438 if self.CmdApp: |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1439 its = sorted(self.transcripts.items()) |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1440 for (fname, transcript) in its: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1441 self._test_transcript(fname, transcript) |
261
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1442 regexPattern = pyparsing.QuotedString(quoteChar=r'/', escChar='\\', multiline=True, unquoteResults=True) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1443 regexPattern.ignore(pyparsing.cStyleComment) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1444 notRegexPattern = pyparsing.Word(pyparsing.printables) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1445 notRegexPattern.setParseAction(lambda t: re.escape(t[0])) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1446 expectationParser = regexPattern | notRegexPattern |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1447 endStrippingRegex = re.compile(r'[ \t]*\n') |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1448 def _test_transcript(self, fname, transcript): |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1449 lineNum = 0 |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1450 try: |
304
8c96f829ba1b
tweaking transcript test newlines (complete)
catherine@dellzilla
parents:
303
diff
changeset
|
1451 line = transcript.next() |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1452 while True: |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1453 while not line.startswith(self.cmdapp.prompt): |
304
8c96f829ba1b
tweaking transcript test newlines (complete)
catherine@dellzilla
parents:
303
diff
changeset
|
1454 line = transcript.next() |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1455 command = [line[len(self.cmdapp.prompt):]] |
304
8c96f829ba1b
tweaking transcript test newlines (complete)
catherine@dellzilla
parents:
303
diff
changeset
|
1456 line = transcript.next() |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1457 while line.startswith(self.cmdapp.continuation_prompt): |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1458 command.append(line[len(self.cmdapp.continuation_prompt):]) |
304
8c96f829ba1b
tweaking transcript test newlines (complete)
catherine@dellzilla
parents:
303
diff
changeset
|
1459 line = transcript.next() |
322 | 1460 command = ''.join(command) |
305 | 1461 self.cmdapp.onecmd(command) |
322 | 1462 result = self.outputTrap.read() |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1463 if line.startswith(self.cmdapp.prompt): |
262
e81378f82c7c
transcript tests with regex now work smoothly
Catherine Devlin <catherine.devlin@gmail.com>
parents:
261
diff
changeset
|
1464 message = '\nFile %s, line %d\nCommand was:\n%s\nExpected: (nothing)\nGot:\n%s\n'%\ |
e81378f82c7c
transcript tests with regex now work smoothly
Catherine Devlin <catherine.devlin@gmail.com>
parents:
261
diff
changeset
|
1465 (fname, lineNum, command, result) |
e81378f82c7c
transcript tests with regex now work smoothly
Catherine Devlin <catherine.devlin@gmail.com>
parents:
261
diff
changeset
|
1466 self.assert_(not(result.strip()), message) |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1467 continue |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1468 expected = [] |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1469 while not line.startswith(self.cmdapp.prompt): |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1470 expected.append(line) |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1471 line = transcript.next() |
322 | 1472 expected = ''.join(expected) |
260
2b69c4d72cd8
unfinished experiments with testing for regular expressions
Catherine Devlin <catherine.devlin@gmail.com>
parents:
259
diff
changeset
|
1473 message = '\nFile %s, line %d\nCommand was:\n%s\nExpected:\n%s\nGot:\n%s\n'%\ |
261
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1474 (fname, lineNum, command, expected, result) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1475 expected = self.expectationParser.transformString(expected) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1476 expected = self.endStrippingRegex.sub('\s*\n', expected) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1477 self.assert_(re.match(expected, result, re.MULTILINE | re.DOTALL), message) |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1478 except StopIteration: |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1479 pass |
230 | 1480 def tearDown(self): |
1481 if self.CmdApp: | |
1482 self.outputTrap.tearDown() | |
325
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1483 |
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1484 def run(app): |
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1485 parser = optparse.OptionParser() |
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1486 parser.add_option('-t', '--test', dest='test', action="store_true", |
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1487 help='Test against transcript(s) in FILE (wildcards OK)') |
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1488 (callopts, callargs) = parser.parse_args() |
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1489 if callopts.test: |
327 | 1490 class TestMyAppCase(Cmd2TestCase): |
1491 CmdApp = app.__class__ | |
326 | 1492 app.__class__.testfiles = callargs |
325
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1493 sys.argv = [sys.argv[0]] # the --test argument upsets unittest.main() |
326 | 1494 testcase = TestMyAppCase() |
1495 runner = unittest.TextTestRunner() | |
1496 result = runner.run(testcase) | |
1497 result.printErrors() | |
325
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1498 else: |
327 | 1499 # hold onto the args and run .onecmd with them |
1500 # in sqlpython, first arg has implied \connect | |
1501 for initial_command in callargs: | |
1502 if app.onecmd(initial_command + '\n') == app._STOP_AND_EXIT: | |
1503 return | |
325
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1504 app.cmdloop() |
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1505 |
230 | 1506 if __name__ == '__main__': |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1507 doctest.testmod(optionflags = doctest.NORMALIZE_WHITESPACE) |
325
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1508 |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1509 ''' |
327 | 1510 To make your application transcript-testable, replace |
1511 | |
1512 :: | |
1513 | |
1514 app = MyApp() | |
1515 app.cmdloop() | |
1516 | |
1517 with | |
1518 | |
1519 :: | |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1520 |
327 | 1521 app = MyApp() |
1522 cmd2.run(app) | |
1523 | |
1524 Then run a session of your application and paste the entire screen contents | |
1525 into a file, ``transcript.test``, and invoke the test like:: | |
1526 | |
1527 python myapp.py --test transcript.test | |
1528 | |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1529 Wildcards can be used to test against multiple transcript files. |
327 | 1530 ''' |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1531 |
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1532 |