annotate cmd2.py @ 375:6cc12ad6e616

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