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