annotate cmd2.py @ 438:a5f3d5a89d6c tip

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