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