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