Mercurial > python-cmd2

annotate cmd2.py @ 153:5c5c458a6b70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
parsing going well
author catherine@dellzilla
date Fri, 21 Nov 2008 14:33:15 -0500
parents 693d11072e8e
children 606ad25c7f7e
rev   line source
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
1 """Variant on standard library's cmd with extra features.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
2
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
3 To use, simply import cmd2.Cmd instead of cmd.Cmd; use precisely as though you
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
4 were using the standard library's cmd, while enjoying the extra features.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
5
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
6 Searchable command history (commands: "hi", "li", "run")
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
7 Load commands from file, save to file, edit commands in file
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
8 Multi-line commands
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
9 Case-insensitive commands
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
10 Special-character shortcut commands (beyond cmd's "@" and "!")
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
11 Settable environment parameters
13
c6e8b645c0ab tweaking docs
catherine@localhost
parents: 12
diff changeset
12 Parsing commands with `optparse` options (flags)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
13 Redirection to file with >, >>; input from file with <
112
e3b8eaadea56 going to collapse down out of overdone package structure
catherine@Elli.myhome.westell.com
parents: 109
diff changeset
14 Easy transcript-based testing of applications (see example/example.py)
13
c6e8b645c0ab tweaking docs
catherine@localhost
parents: 12
diff changeset
15
84
416ea36af789 fixed bug in setting parameters
catherine@Elli.myhome.westell.com
parents: 83
diff changeset
16 Note that redirection with > and | will only work if `self.stdout.write()`
416ea36af789 fixed bug in setting parameters
catherine@Elli.myhome.westell.com
parents: 83
diff changeset
17 is used in place of `print`. The standard library's `cmd` module is
416ea36af789 fixed bug in setting parameters
catherine@Elli.myhome.westell.com
parents: 83
diff changeset
18 written to use `self.stdout.write()`,
416ea36af789 fixed bug in setting parameters
catherine@Elli.myhome.westell.com
parents: 83
diff changeset
19
14
a242603905d9 ready to release 0.3.0
catherine@localhost
parents: 13
diff changeset
20 - Catherine Devlin, Jan 03 2008 - catherinedevlin.blogspot.com
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
21
126
197a312f2656 push to get to v 126
catherine@dellzilla
parents: 124
diff changeset
22 mercurial repository at http://www.assembla.com/wiki/show/python-cmd2
14
a242603905d9 ready to release 0.3.0
catherine@localhost
parents: 13
diff changeset
23 CHANGES:
a242603905d9 ready to release 0.3.0
catherine@localhost
parents: 13
diff changeset
24 As of 0.3.0, options should be specified as `optparse` options. See README.txt.
a242603905d9 ready to release 0.3.0
catherine@localhost
parents: 13
diff changeset
25 flagReader.py options are still supported for backward compatibility
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
26 """
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
27 import cmd, re, os, sys, optparse, subprocess, tempfile, pyparsing, doctest, unittest, string
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
28 from optparse import make_option
140
e49ded85ba4c keeping comments in history now
catherine@Elli.myhome.westell.com
parents: 138
diff changeset
29 __version__ = '0.4.4'
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
30
11
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
31 class OptionParser(optparse.OptionParser):
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
32 def exit(self, status=0, msg=None):
38
6d715d7a04fd proper exit after -h, -v
catherine@localhost
parents: 37
diff changeset
33 self.values._exit = True
11
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
34 if msg:
15
0eb8d4e18472 fixed error handling
catherine@localhost
parents: 14
diff changeset
35 print msg
11
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
36
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
37 def error(self, msg):
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
38 """error(msg : string)
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
39
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
40 Print a usage message incorporating 'msg' to stderr and exit.
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
41 If you override this in a subclass, it should not return -- it
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
42 should either exit or raise an exception.
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
43 """
15
0eb8d4e18472 fixed error handling
catherine@localhost
parents: 14
diff changeset
44 raise
11
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
45
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
46 def options(option_list):
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
47 def option_setup(func):
11
34107b79c840 working the refactor still
catherine@localhost
parents: 10
diff changeset
48 optionParser = OptionParser()
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
49 for opt in option_list:
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
50 optionParser.add_option(opt)
12
catherine@localhost
parents: 11
diff changeset
51 optionParser.set_usage("%s [options] arg" % func.__name__.strip('do_'))
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
52 def newFunc(instance, arg):
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
53 try:
20
c8efa4369189 fixes to option parsing
catherine@cordelia
parents: 15
diff changeset
54 opts, arg = optionParser.parse_args(arg.split())
37
a974e2f44cbe made redirectors work with app-specific StatementEndPattern
catherine@localhost
parents: 36
diff changeset
55 arg = ' '.join(arg)
20
c8efa4369189 fixes to option parsing
catherine@cordelia
parents: 15
diff changeset
56 except (optparse.OptionValueError, optparse.BadOptionError,
c8efa4369189 fixes to option parsing
catherine@cordelia
parents: 15
diff changeset
57 optparse.OptionError, optparse.AmbiguousOptionError,
c8efa4369189 fixes to option parsing
catherine@cordelia
parents: 15
diff changeset
58 optparse.OptionConflictError), e:
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
59 print e
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
60 optionParser.print_help()
38
6d715d7a04fd proper exit after -h, -v
catherine@localhost
parents: 37
diff changeset
61 return
6d715d7a04fd proper exit after -h, -v
catherine@localhost
parents: 37
diff changeset
62 if hasattr(opts, '_exit'):
6d715d7a04fd proper exit after -h, -v
catherine@localhost
parents: 37
diff changeset
63 return None
37
a974e2f44cbe made redirectors work with app-specific StatementEndPattern
catherine@localhost
parents: 36
diff changeset
64 result = func(instance, arg, opts)
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
65 return result
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
66 newFunc.__doc__ = '%s\n%s' % (func.__doc__, optionParser.format_help())
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
67 return newFunc
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
68 return option_setup
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
69
27
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
70 class PasteBufferError(EnvironmentError):
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
71 if sys.platform[:3] == 'win':
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
72 errmsg = """Redirecting to or from paste buffer requires pywin32
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
73 to be installed on operating system.
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
74 Download from http://sourceforge.net/projects/pywin32/"""
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
75 else:
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
76 errmsg = """Redirecting to or from paste buffer requires xclip
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
77 to be installed on operating system.
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
78 On Debian/Ubuntu, 'sudo apt-get install xclip' will install it."""
28
28b3fb301d3d almost working, but problem with check_call
catherine@cordelia
parents: 27
diff changeset
79 def __init__(self):
27
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
80 Exception.__init__(self, self.errmsg)
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
81
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
82 '''check here if functions exist; otherwise, stub out'''
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
83 pastebufferr = """Redirecting to or from paste buffer requires %s
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
84 to be installed on operating system.
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
85 %s"""
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
86 if subprocess.mswindows:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
87 try:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
88 import win32clipboard
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
89 def getPasteBuffer():
28
28b3fb301d3d almost working, but problem with check_call
catherine@cordelia
parents: 27
diff changeset
90 win32clipboard.OpenClipboard(0)
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
91 try:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
92 result = win32clipboard.GetClipboardData()
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
93 except TypeError:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
94 result = '' #non-text
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
95 win32clipboard.CloseClipboard()
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
96 return result
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
97 def writeToPasteBuffer(txt):
28
28b3fb301d3d almost working, but problem with check_call
catherine@cordelia
parents: 27
diff changeset
98 win32clipboard.OpenClipboard(0)
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
99 win32clipboard.EmptyClipboard()
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
100 win32clipboard.SetClipboardText(txt)
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
101 win32clipboard.CloseClipboard()
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
102 except ImportError:
106
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
103 def getPasteBuffer(*args):
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
104 raise OSError, pastebufferr % ('pywin32', 'Download from http://sourceforge.net/projects/pywin32/')
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
105 setPasteBuffer = getPasteBuffer
27
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
106 else:
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
107 can_clip = False
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
108 try:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
109 subprocess.check_call('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
110 can_clip = True
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
111 except AttributeError: # check_call not defined, Python < 2.5
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
112 teststring = 'Testing for presence of xclip.'
31
dd64c0e3dbe0 fixed err in python 2.4 xclip detection
catherine@localhost
parents: 29
diff changeset
113 xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
114 xclipproc.stdin.write(teststring)
31
dd64c0e3dbe0 fixed err in python 2.4 xclip detection
catherine@localhost
parents: 29
diff changeset
115 xclipproc.stdin.close()
dd64c0e3dbe0 fixed err in python 2.4 xclip detection
catherine@localhost
parents: 29
diff changeset
116 xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
117 if xclipproc.stdout.read() == teststring:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
118 can_clip = True
56
f844b6c78192 fixing (hopefully) broken pipe error for headless systems
catherine.devlin@gmail.com
parents: 54
diff changeset
119 except (subprocess.CalledProcessError, OSError, IOError):
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
120 pass
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
121 if can_clip:
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
122 def getPasteBuffer():
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
123 xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
124 return xclipproc.stdout.read()
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
125 def writeToPasteBuffer(txt):
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
126 xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
127 xclipproc.stdin.write(txt)
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
128 xclipproc.stdin.close()
83
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
129 # but we want it in both the "primary" and "mouse" clipboards
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
130 xclipproc = subprocess.Popen('xclip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
131 xclipproc.stdin.write(txt)
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
132 xclipproc.stdin.close()
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
133 else:
106
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
134 def getPasteBuffer(*args):
29
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
135 raise OSError, pastebufferr % ('xclip', 'On Debian/Ubuntu, install with "sudo apt-get install xclip"')
c4bd5f1a6968 paste buffer working on linux and windows
catherine@cordelia
parents: 28
diff changeset
136 setPasteBuffer = getPasteBuffer
106
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
137 writeToPasteBuffer = getPasteBuffer
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
138
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
139 pyparsing.ParserElement.setDefaultWhitespaceChars(' \t')
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
140 def parseSearchResults(pattern, s):
81
a3b0ef23146f trying to parseResults
catherine@Elli.myhome.westell.com
parents: 80
diff changeset
141 generator = pattern.scanString(s)
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
142 try:
81
a3b0ef23146f trying to parseResults
catherine@Elli.myhome.westell.com
parents: 80
diff changeset
143 result, start, stop = generator.next()
a3b0ef23146f trying to parseResults
catherine@Elli.myhome.westell.com
parents: 80
diff changeset
144 result['before'], result['after'] = s[:start], s[stop:]
82
bbf0afc6868b new parseResults working
catherine@Elli.myhome.westell.com
parents: 81
diff changeset
145 result['upToIncluding'] = s[:stop]
81
a3b0ef23146f trying to parseResults
catherine@Elli.myhome.westell.com
parents: 80
diff changeset
146 except StopIteration:
a3b0ef23146f trying to parseResults
catherine@Elli.myhome.westell.com
parents: 80
diff changeset
147 result = pyparsing.ParseResults('')
a3b0ef23146f trying to parseResults
catherine@Elli.myhome.westell.com
parents: 80
diff changeset
148 result['before'] = s
a3b0ef23146f trying to parseResults
catherine@Elli.myhome.westell.com
parents: 80
diff changeset
149 return result
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
150
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
151 class Cmd(cmd.Cmd):
103
e4daf715fc31 echo on
catherine@dellzilla
parents: 100
diff changeset
152 echo = False
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
153 caseInsensitive = True
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
154 continuationPrompt = '> '
137
308e99cebbb8 comments working?
catherine@dellzilla
parents: 136
diff changeset
155 shortcuts = {'?': 'help', '!': 'shell', '@': 'load' }
106
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
156 excludeFromHistory = '''run r list l history hi ed edit li eof'''.split()
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
157 noSpecialParse = 'set ed edit exit'.split()
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
158 defaultExtension = 'txt'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
159 defaultFileName = 'command.txt'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
160 editor = os.environ.get('EDITOR')
42
b3200c6e5763 inserting exception for quit...
catherine@cordelia
parents: 41
diff changeset
161 _STOP_AND_EXIT = 2
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
162 if not editor:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
163 if sys.platform[:3] == 'win':
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
164 editor = 'notepad'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
165 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
166 for editor in ['gedit', 'kate', 'vim', 'emacs', 'nano', 'pico']:
47
927bc07467de fixed misfind of editor
catherine@cordelia
parents: 46
diff changeset
167 if not os.system('which %s' % (editor)):
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
168 break
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
169
103
e4daf715fc31 echo on
catherine@dellzilla
parents: 100
diff changeset
170 settable = ['prompt', 'continuationPrompt', 'defaultFileName', 'editor', 'caseInsensitive', 'echo']
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
171 def do_cmdenvironment(self, args):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
172 self.stdout.write("""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
173 Commands are %(casesensitive)scase-sensitive.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
174 Commands may be terminated with: %(terminators)s
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
175 Settable parameters: %(settable)s
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
176 """ %
2
1ea887b51cad python 2.4 compatibility
catherine@DellZilla.myhome.westell.com
parents: 0
diff changeset
177 { 'casesensitive': ('not ' and self.caseInsensitive) or '',
83
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
178 'terminators': self.terminatorPattern,
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
179 'settable': ' '.join(self.settable)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
180 })
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
181
10
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
182 def do_help(self, arg):
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
183 cmd.Cmd.do_help(self, arg)
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
184 try:
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
185 fn = getattr(self, 'do_' + arg)
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
186 if fn and fn.optionParser:
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
187 fn.optionParser.print_help(file=self.stdout)
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
188 except AttributeError:
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
189 pass
47af95ad83c7 working the refactor still
catherine@localhost
parents: 4
diff changeset
190
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
191 def __init__(self, *args, **kwargs):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
192 cmd.Cmd.__init__(self, *args, **kwargs)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
193 self.history = History()
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
194 self._init_parser()
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
195
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
196 def do_shortcuts(self, args):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
197 """Lists single-key shortcuts available."""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
198 result = "\n".join('%s: %s' % (sc[0], sc[1]) for sc in self.shortcuts.items())
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
199 self.stdout.write("Single-key shortcuts for other commands:\n%s\n" % (result))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
200
137
308e99cebbb8 comments working?
catherine@dellzilla
parents: 136
diff changeset
201 commentGrammars = pyparsing.Or([pyparsing.pythonStyleComment, pyparsing.cStyleComment])
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
202 commentGrammars.addParseAction(lambda x: '')
136
67558b85ab38 comments working?
catherine@dellzilla
parents: 135
diff changeset
203 commentInProgress = pyparsing.Literal('/*') + pyparsing.SkipTo(pyparsing.stringEnd)
146
9ffb01d8876f streamlining parsing
catherine@dellzilla
parents: 145
diff changeset
204 terminators = [';', '\n\n']
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
205 multilineCommands = []
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
206
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
207 def _init_parser(self):
146
9ffb01d8876f streamlining parsing
catherine@dellzilla
parents: 145
diff changeset
208 '''
9ffb01d8876f streamlining parsing
catherine@dellzilla
parents: 145
diff changeset
209 >>> c = Cmd()
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
210 >>> c.multilineCommands = ['multiline']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
211 >>> c.caseInsensitive = True
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
212 >>> c._init_parser()
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
213 >>> print c.parser.parseString('barecommand').dump()
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
214 ['barecommand', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
215 - args:
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
216 - command: barecommand
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
217 - statement: ['barecommand', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
218 - args:
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
219 - command: barecommand
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
220 >>> print c.parser.parseString('COMmand with args').dump()
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
221 ['command', ' with args']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
222 - args: with args
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
223 - command: command
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
224 - statement: ['command', ' with args']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
225 - args: with args
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
226 - command: command
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
227 >>> print c.parser.parseString('command with args and terminator; and suffix').dump()
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
228 ['command', 'with args and terminator', ';', ' and suffix']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
229 - args: with args and terminator
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
230 - command: command
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
231 - statement: ['command', 'with args and terminator', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
232 - args: with args and terminator
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
233 - command: command
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
234 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
235 - suffix: and suffix
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
236 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
237 >>> print c.parser.parseString('simple | piped').dump()
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
238 ['simple', '', '|', ' piped']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
239 - args:
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
240 - command: simple
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
241 - pipeDest: piped
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
242 - statement: ['simple', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
243 - args:
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
244 - command: simple
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
245 >>> print c.parser.parseString('command with args, terminator;sufx | piped').dump()
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
246 ['command', 'with args, terminator', ';', 'sufx', '|', ' piped']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
247 - args: with args, terminator
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
248 - command: command
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
249 - pipeDest: piped
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
250 - statement: ['command', 'with args, terminator', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
251 - args: with args, terminator
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
252 - command: command
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
253 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
254 - suffix: sufx
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
255 - terminator: ;
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
256 >>> print c.parser.parseString('output into > afile.txt').dump()
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
257 ['output', ' into', '>', ' afile.txt']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
258 - args: into
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
259 - command: output
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
260 - output: >
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
261 - outputDest: afile.txt
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
262 - statement: ['output', ' into']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
263 - args: into
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
264 - command: output
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
265 >>> print c.parser.parseString('output into;sufx | pipethrume plz > afile.txt').dump()
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
266 ['output', 'into', ';', 'sufx', '|', ' pipethrume plz', '>', ' afile.txt']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
267 - args: into
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
268 - command: output
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
269 - output: >
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
270 - outputDest: afile.txt
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
271 - pipeDest: pipethrume plz
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
272 - statement: ['output', 'into', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
273 - args: into
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
274 - command: output
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
275 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
276 - suffix: sufx
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
277 - terminator: ;
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
278 >>> print c.parser.parseString('output to paste buffer >> ').dump()
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
279 ['output', ' to paste buffer', '>>', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
280 - args: to paste buffer
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
281 - command: output
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
282 - output: >>
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
283 - outputDest:
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
284 - statement: ['output', ' to paste buffer']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
285 - args: to paste buffer
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
286 - command: output
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
287 >>> print c.parser.parseString('ignore the /* commented | > */ stuff;').dump()
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
288 ['ignore', 'the /* commented | > */ stuff', ';', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
289 - args: the /* commented | > */ stuff
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
290 - command: ignore
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
291 - statement: ['ignore', 'the /* commented | > */ stuff', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
292 - args: the /* commented | > */ stuff
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
293 - command: ignore
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
294 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
295 - suffix:
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
296 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
297 >>> print c.parser.parseString('has > inside;').dump()
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
298 ['has', '> inside', ';', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
299 - args: > inside
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
300 - command: has
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
301 - statement: ['has', '> inside', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
302 - args: > inside
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
303 - command: has
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
304 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
305 - suffix:
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
306 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
307 >>> print c.parser.parseString('multiline has > inside an unfinished command').dump()
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
308 ['multiline', 'has > inside an unfinished command']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
309 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
310 >>> print c.parser.parseString('multiline has > inside;').dump()
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
311 ['multiline', 'has > inside', ';', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
312 - args: has > inside
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
313 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
314 - statement: ['multiline', 'has > inside', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
315 - args: has > inside
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
316 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
317 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
318 - suffix:
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
319 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
320 >>> print c.parser.parseString('multiline command /* with comment in progress;').dump()
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
321 ['multiline', 'command /* with comment in progress;']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
322 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
323 >>> print c.parser.parseString('multiline command /* with comment complete */ is done;').dump()
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
324 ['multiline', 'command /* with comment complete */ is done', ';', '']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
325 - args: command /* with comment complete */ is done
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
326 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
327 - statement: ['multiline', 'command /* with comment complete */ is done', ';']
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
328 - args: command /* with comment complete */ is done
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
329 - multilineCommand: multiline
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
330 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
331 - suffix:
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
332 - terminator: ;
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
333 '''
146
9ffb01d8876f streamlining parsing
catherine@dellzilla
parents: 145
diff changeset
334 outputParser = pyparsing.oneOf(['>>','>'])('output')
9ffb01d8876f streamlining parsing
catherine@dellzilla
parents: 145
diff changeset
335 terminatorParser = pyparsing.oneOf(self.terminators)('terminator')
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
336 stringEnd = pyparsing.stringEnd ^ '\nEOF'
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
337 multilineCommand = pyparsing.Or([pyparsing.Keyword(c, caseless=self.caseInsensitive) for c in self.multilineCommands])('multilineCommand')
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
338 oneLineCommand = pyparsing.Word(pyparsing.printables)('command')
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
339 afterElements = \
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
340 pyparsing.Optional('|' + pyparsing.SkipTo(outputParser ^ stringEnd)('pipeDest')) + \
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
341 pyparsing.Optional(outputParser + pyparsing.SkipTo(stringEnd)('outputDest'))
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
342 if self.caseInsensitive:
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
343 multilineCommand.setParseAction(lambda x: x[0].lower())
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
344 oneLineCommand.setParseAction(lambda x: x[0].lower())
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
345 self.parser = (
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
346 (((multilineCommand ^ oneLineCommand) + pyparsing.SkipTo(terminatorParser)('args') + terminatorParser)('statement') +
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
347 pyparsing.SkipTo(outputParser ^ '|' ^ stringEnd)('suffix') + afterElements)
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
348 ^
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
349 multilineCommand + pyparsing.SkipTo(pyparsing.stringEnd)
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
350 ^
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
351 ((oneLineCommand + pyparsing.SkipTo(terminatorParser ^ stringEnd ^ '|' ^ outputParser)('args'))('statement') +
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
352 afterElements)
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
353 )
148
01ad9cd681a7 all but ignore seems to work
catherine@dellzilla
parents: 147
diff changeset
354 self.commentGrammars.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).setParseAction(lambda x: '')
01ad9cd681a7 all but ignore seems to work
catherine@dellzilla
parents: 147
diff changeset
355 self.commentInProgress.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).ignore(pyparsing.cStyleComment)
152
693d11072e8e hmm, complications with gt within statements
catherine@Elli.myhome.westell.com
parents: 151
diff changeset
356 self.parser.ignore(pyparsing.sglQuotedString).ignore(pyparsing.dblQuotedString).ignore(self.commentGrammars).ignore(self.commentInProgress)
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
357
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
358 def parsed(self, s):
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
359 result = self.parser.parseString(s)
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
360 result['command'] = result.multilineCommand or result.command
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
361 result['cleanArgs'] = self.commentGrammars.transformString(result.args)
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
362 result['statement'] = ' '.join(result.statement)
81
a3b0ef23146f trying to parseResults
catherine@Elli.myhome.westell.com
parents: 80
diff changeset
363 return result
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
364
3
4520a1a073ff require terminator for redirection
catherine@cordelia
parents: 2
diff changeset
365 def extractCommand(self, statement):
4520a1a073ff require terminator for redirection
catherine@cordelia
parents: 2
diff changeset
366 try:
4520a1a073ff require terminator for redirection
catherine@cordelia
parents: 2
diff changeset
367 (command, args) = statement.split(None,1)
4520a1a073ff require terminator for redirection
catherine@cordelia
parents: 2
diff changeset
368 except ValueError:
4520a1a073ff require terminator for redirection
catherine@cordelia
parents: 2
diff changeset
369 (command, args) = statement, ''
4520a1a073ff require terminator for redirection
catherine@cordelia
parents: 2
diff changeset
370 if self.caseInsensitive:
4520a1a073ff require terminator for redirection
catherine@cordelia
parents: 2
diff changeset
371 command = command.lower()
4520a1a073ff require terminator for redirection
catherine@cordelia
parents: 2
diff changeset
372 return command, args
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
373
44
b66372883bb4 marked to v 0.3.3
catherine@cordelia
parents: 43
diff changeset
374 def onecmd(self, line, assumeComplete=False):
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
375 """Interpret the argument as though it had been typed in response
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
376 to the prompt.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
377
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
378 This may be overridden, but should not normally need to be;
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
379 see the precmd() and postcmd() methods for useful execution hooks.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
380 The return value is a flag indicating whether interpretation of
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
381 commands by the interpreter should stop.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
382
3
4520a1a073ff require terminator for redirection
catherine@cordelia
parents: 2
diff changeset
383 """
83
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
384 line = line.strip()
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
385 if not line:
2176ce847939 merged copy to both clipboards in
catherine@Elli.myhome.westell.com
parents: 82
diff changeset
386 return
135
7c0a89fccf2b broken; midway through comments
catherine@Elli.myhome.westell.com
parents: 134
diff changeset
387 if not pyparsing.Or(self.commentGrammars).setParseAction(lambda x: '').transformString(line):
7c0a89fccf2b broken; midway through comments
catherine@Elli.myhome.westell.com
parents: 134
diff changeset
388 return
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
389 statement = self.parsed(line)
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
390 while (statement.command in self.multilineCommands) and not \
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
391 (statement.terminator or assumeComplete):
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
392 statement = self.parsed('%s\n%s' % (statement.fullStatement,
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
393 self.pseudo_raw_input(self.continuationPrompt)))
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
394
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
395 statekeeper = None
25
6948d1f9e4b4 missing xclip half-working
catherine@localhost
parents: 24
diff changeset
396 stop = 0
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
397 if statement.input:
143
f0fa9965a985 catch xclip-absent input errors
catherine@dellzilla
parents: 142
diff changeset
398 try:
f0fa9965a985 catch xclip-absent input errors
catherine@dellzilla
parents: 142
diff changeset
399 if statement.inputFrom:
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
400 newinput = open(statement.inputFrom, 'r').read()
143
f0fa9965a985 catch xclip-absent input errors
catherine@dellzilla
parents: 142
diff changeset
401 else:
f0fa9965a985 catch xclip-absent input errors
catherine@dellzilla
parents: 142
diff changeset
402 newinput = getPasteBuffer()
f0fa9965a985 catch xclip-absent input errors
catherine@dellzilla
parents: 142
diff changeset
403 except (OSError,), e:
f0fa9965a985 catch xclip-absent input errors
catherine@dellzilla
parents: 142
diff changeset
404 print e
f0fa9965a985 catch xclip-absent input errors
catherine@dellzilla
parents: 142
diff changeset
405 return 0
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
406 start, end = self.redirectInPattern.scanString(statement.fullStatement).next()[1:]
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
407 return self.onecmd('%s%s%s' % (statement.fullStatement[:start],
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
408 newinput, statement.fullStatement[end:]))
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
409 if statement.pipe and statement.pipeTo:
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
410 redirect = subprocess.Popen(statement.pipeTo, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
51
26e33f64f68e trying new unified pipe and redirect
catherine@localhost
parents: 50
diff changeset
411 statekeeper = Statekeeper(self, ('stdout',))
47
927bc07467de fixed misfind of editor
catherine@cordelia
parents: 46
diff changeset
412 self.stdout = redirect.stdin
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
413 elif statement.output:
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
414 statekeeper = Statekeeper(self, ('stdout',))
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
415 if statement.outputTo:
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
416 mode = 'w'
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
417 if statement.output == '>>':
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
418 mode = 'a'
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
419 try:
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
420 self.stdout = open(statement.outputTo, mode)
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
421 except OSError, e:
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
422 print e
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
423 return 0
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
424 else:
51
26e33f64f68e trying new unified pipe and redirect
catherine@localhost
parents: 50
diff changeset
425 statekeeper = Statekeeper(self, ('stdout',))
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
426 self.stdout = tempfile.TemporaryFile()
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
427 if statement.output == '>>':
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
428 self.stdout.write(getPasteBuffer())
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
429 try:
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
430 stop = cmd.Cmd.onecmd(self, statement.statement)
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
431 except Exception, e:
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
432 print e
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
433 try:
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
434 if statement.command not in self.excludeFromHistory:
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
435 self.history.append(statement.fullStatement)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
436 finally:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
437 if statekeeper:
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
438 if statement.output and not statement.outputTo:
27
a76798cde34c hooray, pasting working in windows
catherine@cordelia
parents: 26
diff changeset
439 self.stdout.seek(0)
134
c28ae4f75c15 incorporated changes from branch at work
catherine@Elli.myhome.westell.com
parents: 133
diff changeset
440 try:
c28ae4f75c15 incorporated changes from branch at work
catherine@Elli.myhome.westell.com
parents: 133
diff changeset
441 writeToPasteBuffer(self.stdout.read())
c28ae4f75c15 incorporated changes from branch at work
catherine@Elli.myhome.westell.com
parents: 133
diff changeset
442 except Exception, e:
c28ae4f75c15 incorporated changes from branch at work
catherine@Elli.myhome.westell.com
parents: 133
diff changeset
443 print str(e)
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
444 elif statement.pipe:
52
49de899a05a8 new unified pipe and redirect works on wc
catherine@localhost
parents: 51
diff changeset
445 for result in redirect.communicate():
49de899a05a8 new unified pipe and redirect works on wc
catherine@localhost
parents: 51
diff changeset
446 statekeeper.stdout.write(result or '')
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
447 self.stdout.close()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
448 statekeeper.restore()
52
49de899a05a8 new unified pipe and redirect works on wc
catherine@localhost
parents: 51
diff changeset
449
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
450 return stop
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
451
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
452 def pseudo_raw_input(self, prompt):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
453 """copied from cmd's cmdloop; like raw_input, but accounts for changed stdin, stdout"""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
454
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
455 if self.use_rawinput:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
456 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
457 line = raw_input(prompt)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
458 except EOFError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
459 line = 'EOF'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
460 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
461 self.stdout.write(prompt)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
462 self.stdout.flush()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
463 line = self.stdin.readline()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
464 if not len(line):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
465 line = 'EOF'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
466 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
467 if line[-1] == '\n': # this was always true in Cmd
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
468 line = line[:-1]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
469 return line
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
470
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
471 def cmdloop(self, intro=None):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
472 """Repeatedly issue a prompt, accept input, parse an initial prefix
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
473 off the received input, and dispatch to action methods, passing them
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
474 the remainder of the line as argument.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
475 """
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
476
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
477 # An almost perfect copy from Cmd; however, the pseudo_raw_input portion
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
478 # has been split out so that it can be called separately
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
479
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
480 self.preloop()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
481 if self.use_rawinput and self.completekey:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
482 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
483 import readline
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
484 self.old_completer = readline.get_completer()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
485 readline.set_completer(self.complete)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
486 readline.parse_and_bind(self.completekey+": complete")
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
487 except ImportError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
488 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
489 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
490 if intro is not None:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
491 self.intro = intro
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
492 if self.intro:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
493 self.stdout.write(str(self.intro)+"\n")
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
494 stop = None
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
495 while not stop:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
496 if self.cmdqueue:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
497 line = self.cmdqueue.pop(0)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
498 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
499 line = self.pseudo_raw_input(self.prompt)
103
e4daf715fc31 echo on
catherine@dellzilla
parents: 100
diff changeset
500 if (self.echo) and (isinstance(self.stdin, file)):
e4daf715fc31 echo on
catherine@dellzilla
parents: 100
diff changeset
501 self.stdout.write(line + '\n')
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
502 line = self.precmd(line)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
503 stop = self.onecmd(line)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
504 stop = self.postcmd(stop, line)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
505 self.postloop()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
506 finally:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
507 if self.use_rawinput and self.completekey:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
508 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
509 import readline
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
510 readline.set_completer(self.old_completer)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
511 except ImportError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
512 pass
43
e03a8c03ac37 command-line args working
catherine@cordelia
parents: 42
diff changeset
513 return stop
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
514
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
515 def do_EOF(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
516 return True
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
517 do_eof = do_EOF
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
518
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
519 def showParam(self, param):
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
520 param = param.strip().lower()
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
521 if param in self.settable:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
522 val = getattr(self, param)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
523 self.stdout.write('%s: %s\n' % (param, str(getattr(self, param))))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
524
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
525 def do_quit(self, arg):
43
e03a8c03ac37 command-line args working
catherine@cordelia
parents: 42
diff changeset
526 return self._STOP_AND_EXIT
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
527 do_exit = do_quit
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
528 do_q = do_quit
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
529
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
530 def do_show(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
531 'Shows value of a parameter'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
532 if arg.strip():
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
533 self.showParam(arg)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
534 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
535 for param in self.settable:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
536 self.showParam(param)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
537
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
538 def do_set(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
539 'Sets a parameter'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
540 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
541 paramName, val = arg.split(None, 1)
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
542 paramName = paramName.strip().lower()
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
543 if paramName not in self.settable:
106
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
544 raise NotSettableError
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
545 currentVal = getattr(self, paramName)
106
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
546 if (val[0] == val[-1]) and val[0] in ("'", '"'):
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
547 val = val[1:-1]
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
548 else:
2d3232693807 prompt-setting quirks
catherine@dellzilla
parents: 105
diff changeset
549 val = cast(currentVal, self.parsed(val).unterminated)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
550 setattr(self, paramName, val)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
551 self.stdout.write('%s - was: %s\nnow: %s\n' % (paramName, currentVal, val))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
552 except (ValueError, AttributeError, NotSettableError), e:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
553 self.do_show(arg)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
554
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
555 def do_shell(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
556 'execute a command as if at the OS prompt.'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
557 os.system(arg)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
558
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
559 def do_history(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
560 """history [arg]: lists past commands issued
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
561
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
562 no arg -> list all
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
563 arg is integer -> list one history item, by index
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
564 arg is string -> string search
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
565 arg is /enclosed in forward-slashes/ -> regular expression search
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
566 """
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
567 if arg:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
568 history = self.history.get(arg)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
569 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
570 history = self.history
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
571 for hi in history:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
572 self.stdout.write(hi.pr())
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
573 def last_matching(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
574 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
575 if arg:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
576 return self.history.get(arg)[-1]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
577 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
578 return self.history[-1]
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
579 except IndexError:
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
580 return None
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
581 def do_list(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
582 """list [arg]: lists last command issued
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
583
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
584 no arg -> list absolute last
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
585 arg is integer -> list one history item, by index
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
586 - arg, arg - (integer) -> list up to or after #arg
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
587 arg is string -> list last command matching string search
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
588 arg is /enclosed in forward-slashes/ -> regular expression search
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
589 """
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
590 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
591 self.stdout.write(self.last_matching(arg).pr())
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
592 except:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
593 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
594 do_hi = do_history
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
595 do_l = do_list
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
596 do_li = do_list
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
597
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
598 def do_ed(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
599 """ed: edit most recent command in text editor
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
600 ed [N]: edit numbered command from history
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
601 ed [filename]: edit specified file name
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
602
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
603 commands are run after editor is closed.
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
604 "set edit (program-name)" or set EDITOR environment variable
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
605 to control which editing program is used."""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
606 if not self.editor:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
607 print "please use 'set editor' to specify your text editing program of choice."
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
608 return
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
609 filename = self.defaultFileName
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
610 if arg:
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
611 try:
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
612 buffer = self.last_matching(int(arg))
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
613 except ValueError:
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
614 filename = arg
133
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
615 buffer = ''
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
616 else:
31674148b13c just beginning to make comments work
catherine@Elli.myhome.westell.com
parents: 126
diff changeset
617 buffer = self.history[-1]
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
618
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
619 if buffer:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
620 f = open(filename, 'w')
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
621 f.write(buffer or '')
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
622 f.close()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
623
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
624 os.system('%s %s' % (self.editor, filename))
48
34fb41095451 avoiding do_load overload
catherine.devlin@gmail.com
parents: 47
diff changeset
625 self.do__load(filename)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
626 do_edit = do_ed
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
627
91
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
628 saveparser = (pyparsing.Optional(pyparsing.Word(pyparsing.nums)^'*')("idx") +
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
629 pyparsing.Optional(pyparsing.Word(pyparsing.printables))("fname") +
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
630 pyparsing.stringEnd)
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
631 def do_save(self, arg):
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
632 """`save [N] [filename.ext]`
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
633 Saves command from history to file.
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
634 N => Number of command (from history), or `*`;
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
635 most recent command if omitted"""
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
636
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
637 try:
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
638 args = self.saveparser.parseString(arg)
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
639 except pyparsing.ParseException:
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
640 print self.do_save.__doc__
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
641 return
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
642 fname = args.fname or self.defaultFileName
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
643 if args.idx == '*':
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
644 saveme = '\n\n'.join(self.history[:])
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
645 elif args.idx:
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
646 saveme = self.history[int(args.idx)-1]
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
647 else:
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
648 saveme = self.history[-1]
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
649 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
650 f = open(fname, 'w')
91
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
651 f.write(saveme)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
652 f.close()
91
88f2aa240af1 added to save
catherine@Elli.myhome.westell.com
parents: 90
diff changeset
653 print 'Saved to %s' % (fname)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
654 except Exception, e:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
655 print 'Error saving %s: %s' % (fname, str(e))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
656
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
657 def do_load(self, fname=None):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
658 """Runs command(s) from a file."""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
659 if fname is None:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
660 fname = self.defaultFileName
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
661 keepstate = Statekeeper(self, ('stdin','use_rawinput','prompt','continuationPrompt'))
41
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
662 if isinstance(fname, file):
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
663 self.stdin = fname
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
664 else:
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
665 try:
41
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
666 self.stdin = open(fname, 'r')
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
667 except IOError, e:
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
668 try:
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
669 self.stdin = open('%s.%s' % (fname, self.defaultExtension), 'r')
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
670 except IOError:
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
671 print 'Problem opening file %s: \n%s' % (fname, e)
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
672 keepstate.restore()
1275d59c08a7 do_load accepts file object
catherine@cordelia
parents: 39
diff changeset
673 return
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
674 self.use_rawinput = False
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
675 self.prompt = self.continuationPrompt = ''
42
b3200c6e5763 inserting exception for quit...
catherine@cordelia
parents: 41
diff changeset
676 stop = self.cmdloop()
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
677 self.stdin.close()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
678 keepstate.restore()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
679 self.lastcmd = ''
48
34fb41095451 avoiding do_load overload
catherine.devlin@gmail.com
parents: 47
diff changeset
680 return (stop == self._STOP_AND_EXIT) and self._STOP_AND_EXIT
34fb41095451 avoiding do_load overload
catherine.devlin@gmail.com
parents: 47
diff changeset
681 do__load = do_load # avoid an unfortunate legacy use of do_load from sqlpython
43
e03a8c03ac37 command-line args working
catherine@cordelia
parents: 42
diff changeset
682
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
683 def do_run(self, arg):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
684 """run [arg]: re-runs an earlier command
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
685
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
686 no arg -> run most recent command
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
687 arg is integer -> run one history item, by index
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
688 arg is string -> run most recent command by string search
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
689 arg is /enclosed in forward-slashes/ -> run most recent by regex
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
690 """
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
691 'run [N]: runs the SQL that was run N commands ago'
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
692 runme = self.last_matching(arg)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
693 print runme
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
694 if runme:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
695 runme = self.precmd(runme)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
696 stop = self.onecmd(runme)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
697 stop = self.postcmd(stop, runme)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
698 do_r = do_run
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
699
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
700 def fileimport(self, statement, source):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
701 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
702 f = open(source)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
703 except IOError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
704 self.stdout.write("Couldn't read from file %s\n" % source)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
705 return ''
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
706 data = f.read()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
707 f.close()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
708 return data
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
709
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
710 class HistoryItem(str):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
711 def __init__(self, instr):
121
fe432d010ecc going to attempt 2.4 and 2.6 compatibility
catherine@dellzilla
parents: 119
diff changeset
712 str.__init__(self)
0
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
713 self.lowercase = self.lower()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
714 self.idx = None
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
715 def pr(self):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
716 return '-------------------------[%d]\n%s\n' % (self.idx, str(self))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
717
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
718 class History(list):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
719 rangeFrom = re.compile(r'^([\d])+\s*\-$')
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
720 def append(self, new):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
721 new = HistoryItem(new)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
722 list.append(self, new)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
723 new.idx = len(self)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
724 def extend(self, new):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
725 for n in new:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
726 self.append(n)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
727 def get(self, getme):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
728 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
729 getme = int(getme)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
730 if getme < 0:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
731 return self[:(-1 * getme)]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
732 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
733 return [self[getme-1]]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
734 except IndexError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
735 return []
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
736 except (ValueError, TypeError):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
737 getme = getme.strip()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
738 mtch = self.rangeFrom.search(getme)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
739 if mtch:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
740 return self[(int(mtch.group(1))-1):]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
741 if getme.startswith(r'/') and getme.endswith(r'/'):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
742 finder = re.compile(getme[1:-1], re.DOTALL | re.MULTILINE | re.IGNORECASE)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
743 def isin(hi):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
744 return finder.search(hi)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
745 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
746 def isin(hi):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
747 return (getme.lower() in hi.lowercase)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
748 return [itm for itm in self if isin(itm)]
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
749
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
750 class NotSettableError(Exception):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
751 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
752
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
753 def cast(current, new):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
754 """Tries to force a new value into the same type as the current."""
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
755 typ = type(current)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
756 if typ == bool:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
757 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
758 return bool(int(new))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
759 except ValueError, TypeError:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
760 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
761 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
762 new = new.lower()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
763 except:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
764 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
765 if (new=='on') or (new[0] in ('y','t')):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
766 return True
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
767 if (new=='off') or (new[0] in ('n','f')):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
768 return False
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
769 else:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
770 try:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
771 return typ(new)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
772 except:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
773 pass
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
774 print "Problem setting parameter (now %s) to %s; incorrect type?" % (current, new)
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
775 return current
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
776
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
777 class Statekeeper(object):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
778 def __init__(self, obj, attribs):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
779 self.obj = obj
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
780 self.attribs = attribs
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
781 self.save()
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
782 def save(self):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
783 for attrib in self.attribs:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
784 setattr(self, attrib, getattr(self.obj, attrib))
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
785 def restore(self):
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
786 for attrib in self.attribs:
febfdc79550b moved repository to Assembla
catherine@DellZilla.myhome.westell.com
parents:
diff changeset
787 setattr(self.obj, attrib, getattr(self, attrib))
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
788
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
789 class Borg(object):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
790 '''All instances of any Borg subclass will share state.
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
791 from Python Cookbook, 2nd Ed., recipe 6.16'''
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
792 _shared_state = {}
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
793 def __new__(cls, *a, **k):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
794 obj = object.__new__(cls, *a, **k)
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
795 obj.__dict__ = cls._shared_state
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
796 return obj
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
797
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
798 class OutputTrap(Borg):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
799 '''Instantiate an OutputTrap to divert/capture ALL stdout output. For use in unit testing.
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
800 Call `tearDown()` to return to normal output.'''
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
801 def __init__(self):
105
130340609e19 testing beginning to work?
catherine@dellzilla
parents: 104
diff changeset
802 self.old_stdout = sys.stdout
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
803 self.trap = tempfile.TemporaryFile()
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
804 sys.stdout = self.trap
105
130340609e19 testing beginning to work?
catherine@dellzilla
parents: 104
diff changeset
805 def read(self):
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
806 self.trap.seek(0)
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
807 result = self.trap.read()
105
130340609e19 testing beginning to work?
catherine@dellzilla
parents: 104
diff changeset
808 self.trap.truncate(0)
130340609e19 testing beginning to work?
catherine@dellzilla
parents: 104
diff changeset
809 return result.strip('\x00')
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
810 def tearDown(self):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
811 sys.stdout = self.old_stdout
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
812
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
813 class TranscriptReader(object):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
814 def __init__(self, cmdapp, filename='test_cmd2.txt'):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
815 self.cmdapp = cmdapp
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
816 try:
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
817 tfile = open(filename)
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
818 self.transcript = tfile.read()
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
819 tfile.close()
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
820 except IOError:
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
821 self.transcript = ''
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
822 self.bookmark = 0
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
823 def refreshCommandFinder(self):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
824 prompt = pyparsing.Suppress(pyparsing.lineStart + self.cmdapp.prompt)
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
825 continuationPrompt = pyparsing.Suppress(pyparsing.lineStart + self.cmdapp.continuationPrompt)
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
826 self.cmdtxtPattern = (prompt + pyparsing.restOfLine + pyparsing.ZeroOrMore(
119
fe47c5b269cc altering README to match exampleSession.txt
catherine@dellzilla
parents: 117
diff changeset
827 pyparsing.lineEnd + continuationPrompt + pyparsing.restOfLine))("command")
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
828 def inputGenerator(self):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
829 while True:
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
830 self.refreshCommandFinder()
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
831 (thiscmd, startpos, endpos) = self.cmdtxtPattern.scanString(self.transcript[self.bookmark:], maxMatches=1).next()
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
832 lineNum = self.transcript.count('\n', 0, self.bookmark+startpos) + 2
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
833 self.bookmark += endpos
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
834 yield (''.join(thiscmd.command), lineNum)
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
835 def nextExpected(self):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
836 self.refreshCommandFinder()
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
837 try:
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
838 (thiscmd, startpos, endpos) = self.cmdtxtPattern.scanString(self.transcript[self.bookmark:], maxMatches=1).next()
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
839 result = self.transcript[self.bookmark:self.bookmark+startpos]
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
840 self.bookmark += startpos
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
841 return result
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
842 except StopIteration:
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
843 return self.transcript[self.bookmark:]
122
e62aa2f58b7b now works Python 2.4 to Python 2.6
catherine@dellzilla
parents: 121
diff changeset
844
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
845 class Cmd2TestCase(unittest.TestCase):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
846 '''Subclass this, setting CmdApp and transcriptFileName, to make a unittest.TestCase class
109
78c4db4c2045 all done but the proper packaging
catherine@dellzilla
parents: 108
diff changeset
847 that will execute the commands in transcriptFileName and expect the results shown.
78c4db4c2045 all done but the proper packaging
catherine@dellzilla
parents: 108
diff changeset
848 See example.py'''
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
849 # problem: this (raw) case gets called by unittest.main - we don't want it to be. hmm
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
850 CmdApp = None
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
851 transcriptFileName = ''
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
852 def setUp(self):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
853 if self.CmdApp:
105
130340609e19 testing beginning to work?
catherine@dellzilla
parents: 104
diff changeset
854 self.outputTrap = OutputTrap()
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
855 self.cmdapp = self.CmdApp()
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
856 self.transcriptReader = TranscriptReader(self.cmdapp, self.transcriptFileName)
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
857 def testall(self):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
858 if self.CmdApp:
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
859 for (cmdInput, lineNum) in self.transcriptReader.inputGenerator():
117
33cd0e1bebb8 stripping continuation prompts during testing
catherine@dellzilla
parents: 113
diff changeset
860 self.cmdapp.onecmd(cmdInput, assumeComplete=True)
105
130340609e19 testing beginning to work?
catherine@dellzilla
parents: 104
diff changeset
861 result = self.outputTrap.read()
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
862 expected = self.transcriptReader.nextExpected()
107
3e2651cbe376 vigorous whitespace stripping from test results
catherine@dellzilla
parents: 106
diff changeset
863 self.assertEqual(self.stripByLine(result), self.stripByLine(expected),
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
864 '\nFile %s, line %d\nCommand was:\n%s\nExpected:\n%s\nGot:\n%s\n' %
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
865 (self.transcriptFileName, lineNum, cmdInput, expected, result))
107
3e2651cbe376 vigorous whitespace stripping from test results
catherine@dellzilla
parents: 106
diff changeset
866 def stripByLine(self, s):
117
33cd0e1bebb8 stripping continuation prompts during testing
catherine@dellzilla
parents: 113
diff changeset
867 bareprompt = self.cmdapp.continuationPrompt.strip()
122
e62aa2f58b7b now works Python 2.4 to Python 2.6
catherine@dellzilla
parents: 121
diff changeset
868 lines = []
e62aa2f58b7b now works Python 2.4 to Python 2.6
catherine@dellzilla
parents: 121
diff changeset
869 for line in s.splitlines():
e62aa2f58b7b now works Python 2.4 to Python 2.6
catherine@dellzilla
parents: 121
diff changeset
870 line = line.rstrip()
e62aa2f58b7b now works Python 2.4 to Python 2.6
catherine@dellzilla
parents: 121
diff changeset
871 if line.startswith(bareprompt):
e62aa2f58b7b now works Python 2.4 to Python 2.6
catherine@dellzilla
parents: 121
diff changeset
872 line = line.replace(bareprompt, '', 1)
126
197a312f2656 push to get to v 126
catherine@dellzilla
parents: 124
diff changeset
873 lines.append(line)
117
33cd0e1bebb8 stripping continuation prompts during testing
catherine@dellzilla
parents: 113
diff changeset
874 return '\n'.join(lines).strip()
104
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
875 def tearDown(self):
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
876 if self.CmdApp:
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
877 self.outputTrap.tearDown()
bd91925d813c having a hard time capturing stdout
catherine@dellzilla
parents: 103
diff changeset
878
79
f583663c610f switch to pyparsing worked
catherine@Elli.myhome.westell.com
parents: 56
diff changeset
879 if __name__ == '__main__':
153
5c5c458a6b70 parsing going well
catherine@dellzilla
parents: 152
diff changeset
880 doctest.testmod(optionflags = doctest.NORMALIZE_WHITESPACE)