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