annotate sqlpython/sqlpython.py @ 451:fd86d22fe00d

mostly compatible with cmd2 0.6 - minor transcript test problem
author catherine@Drou
date Mon, 15 Feb 2010 17:44:56 -0500
parents b34ea206c7d1
children c6394c335e45
rev   line source
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
1 #
368
477f0bf652b2 version to 1.6.7
catherine@cordelia
parents: 358
diff changeset
2 # SqlPython V1.6.7
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
3 # Author: Luca.Canali@cern.ch, Apr 2006
380
catherine@cordelia
parents: 375
diff changeset
4 # Rev 2-Sep-09
368
477f0bf652b2 version to 1.6.7
catherine@cordelia
parents: 358
diff changeset
5
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
6 # A python module to reproduce Oracle's command line 'sqlplus-like' within python
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
7 # Intended to allow easy customizations and extentions
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
8 # Best used with the companion modules sqlpyPlus and mysqlpy
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
9 # See also http://twiki.cern.ch/twiki/bin/view/PSSGroup/SqlPython
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
10
415
3a2db0db302f must synch
catherine@bothari
parents: 412
diff changeset
11 import cmd2,getpass,binascii,re,os,platform
445
b34ea206c7d1 debug bind var dependence on arg.parsed.expanded
catherine@Drou
parents: 444
diff changeset
12 import pyparsing, connections
443
cd015f2bff44 synch with work
catherine@Drou
parents: 440
diff changeset
13 __version__ = '1.7.0'
415
3a2db0db302f must synch
catherine@bothari
parents: 412
diff changeset
14 try:
3a2db0db302f must synch
catherine@bothari
parents: 412
diff changeset
15 import cx_Oracle
3a2db0db302f must synch
catherine@bothari
parents: 412
diff changeset
16 except ImportError:
3a2db0db302f must synch
catherine@bothari
parents: 412
diff changeset
17 cx_Oracle = None
3a2db0db302f must synch
catherine@bothari
parents: 412
diff changeset
18 try:
3a2db0db302f must synch
catherine@bothari
parents: 412
diff changeset
19 import psycopg2
3a2db0db302f must synch
catherine@bothari
parents: 412
diff changeset
20 except ImportError:
3a2db0db302f must synch
catherine@bothari
parents: 412
diff changeset
21 psycopg2 = None
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
22
339
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
23 class Parser(object):
409
5b88ce5f31ff ugh, trying to separate -- comments from --flags
catherine@DellZilla
parents: 407
diff changeset
24 comment_def = "--" + pyparsing.NotAny('-' + pyparsing.CaselessKeyword('begin')) + pyparsing.ZeroOrMore(pyparsing.CharsNotIn("\n"))
339
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
25 def __init__(self, scanner, retainSeparator=True):
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
26 self.scanner = scanner
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
27 self.scanner.ignore(pyparsing.sglQuotedString)
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
28 self.scanner.ignore(pyparsing.dblQuotedString)
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
29 self.scanner.ignore(self.comment_def)
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
30 self.scanner.ignore(pyparsing.cStyleComment)
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
31 self.retainSeparator = retainSeparator
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
32 def separate(self, txt):
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
33 itms = []
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
34 for (sqlcommand, start, end) in self.scanner.scanString(txt):
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
35 if sqlcommand:
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
36 if type(sqlcommand[0]) == pyparsing.ParseResults:
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
37 if self.retainSeparator:
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
38 itms.append("".join(sqlcommand[0]))
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
39 else:
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
40 itms.append(sqlcommand[0][0])
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
41 else:
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
42 if sqlcommand[0]:
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
43 itms.append(sqlcommand[0])
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
44 return itms
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
45
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
46
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
47 class sqlpython(cmd2.Cmd):
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
48 '''A python module to reproduce Oracle's command line with focus on customization and extention'''
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
49
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
50 def __init__(self):
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
51 cmd2.Cmd.__init__(self)
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
52 self.no_instance()
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
53 self.maxfetch = 1000
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
54 self.terminator = ';'
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
55 self.timeout = 30
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
56 self.commit_on_exit = True
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
57 self.instances = {}
260
fc106df4606b need to work on connection closing
catherine@dellzilla
parents: 259
diff changeset
58
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
59 def no_instance(self):
261
0044cfa5867a disconnections worked out
catherine@dellzilla
parents: 260
diff changeset
60 self.prompt = 'SQL.No_Connection> '
260
fc106df4606b need to work on connection closing
catherine@dellzilla
parents: 259
diff changeset
61 self.curs = None
429
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
62 self.current_instance = None
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
63 self.instance_number = None
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
64
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
65 def make_instance_current(self, instance_number):
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
66 db_instance = self.instances[instance_number]
429
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
67 self.prompt = db_instance.prompt
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
68 self.rdbms = db_instance.rdbms
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
69 self.instance_number = instance_number
429
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
70 self.curs = db_instance.connection.cursor()
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
71 self.current_instance = db_instance
317
f200a222a936 beginning to set up metadata.py
Catherine Devlin <catherine.devlin@gmail.com>
parents: 315
diff changeset
72
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
73 def list_instances(self):
259
c0847a4c7f49 one-shot connection changes
catherine@Elli.myhome.westell.com
parents: 258
diff changeset
74 self.stdout.write('Existing connections:\n')
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
75 self.stdout.write('\n'.join('%s (%s)' % (v.prompt, v.rdbms)
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
76 for (k,v) in sorted(self.instances.items())) + '\n')
259
c0847a4c7f49 one-shot connection changes
catherine@Elli.myhome.westell.com
parents: 258
diff changeset
77
260
fc106df4606b need to work on connection closing
catherine@dellzilla
parents: 259
diff changeset
78 def disconnect(self, arg):
fc106df4606b need to work on connection closing
catherine@dellzilla
parents: 259
diff changeset
79 try:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
80 instance_number = int(arg)
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
81 instance = self.instances[instance_number]
261
0044cfa5867a disconnections worked out
catherine@dellzilla
parents: 260
diff changeset
82 except (ValueError, KeyError):
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
83 self.list_instances()
260
fc106df4606b need to work on connection closing
catherine@dellzilla
parents: 259
diff changeset
84 return
fc106df4606b need to work on connection closing
catherine@dellzilla
parents: 259
diff changeset
85 if self.commit_on_exit:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
86 instance.connection.commit()
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
87 self.instances.pop(instance_number)
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
88 if instance_number == self.instance_number:
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
89 self.no_instance()
261
0044cfa5867a disconnections worked out
catherine@dellzilla
parents: 260
diff changeset
90
0044cfa5867a disconnections worked out
catherine@dellzilla
parents: 260
diff changeset
91 def closeall(self):
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
92 for instance_number in self.instances.keys():
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
93 self.disconnect(instance_number)
261
0044cfa5867a disconnections worked out
catherine@dellzilla
parents: 260
diff changeset
94 self.curs = None
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
95 self.no_instance()
261
0044cfa5867a disconnections worked out
catherine@dellzilla
parents: 260
diff changeset
96
407
188c86d4a11e struggling with option parsing
catherine@DellZilla
parents: 405
diff changeset
97 legal_sql_word = pyparsing.Word(pyparsing.alphanums + '_$#')
188c86d4a11e struggling with option parsing
catherine@DellZilla
parents: 405
diff changeset
98
429
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
99 def successfully_connect_to_number(self, arg):
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
100 try:
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
101 instance_number = int(arg)
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
102 except ValueError:
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
103 return False
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
104 try:
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
105 self.make_instance_current(instance_number)
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
106 except IndexError:
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
107 self.list_instances()
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
108 return False
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
109 if (self.rdbms == 'oracle') and self.serveroutput:
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
110 self.curs.callproc('dbms_output.enable', [])
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
111 return True
451
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
112
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
113 @cmd2.options([cmd2.make_option('-a', '--add', action='store_true',
425
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
114 help='add connection (keep current connection)'),
451
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
115 cmd2.make_option('-c', '--close', action='store_true',
425
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
116 help='close connection {N} (or current)'),
451
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
117 cmd2.make_option('-C', '--closeall', action='store_true',
425
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
118 help='close all connections'),
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
119 cmd2.make_option('--postgres', action='store_true', help='Connect to postgreSQL: `sqlpython --postgres [DBNAME [USERNAME]]`'),
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
120 cmd2.make_option('--oracle', action='store_true', help='Connect to an Oracle database'),
451
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
121 cmd2.make_option('--mysql', action='store_true', help='Connect to a MySQL database'),
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
122 cmd2.make_option('-H', '--hostname', type='string',
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
123 help='Machine where database is hosted'),
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
124 cmd2.make_option('-p', '--port', type='int',
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
125 help='Port to connect to'),
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
126 cmd2.make_option('--password', type='string',
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
127 help='Password'),
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
128 cmd2.make_option('-d', '--database', type='string',
425
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
129 help='Database name to connect to'),
451
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
130 cmd2.make_option('-U', '--username', type='string',
fd86d22fe00d mostly compatible with cmd2 0.6 - minor transcript test problem
catherine@Drou
parents: 445
diff changeset
131 help='Database user name to connect as')])
426
3a2199bf7c84 refactoring connections in progress
catherine@dellzilla
parents: 425
diff changeset
132 def do_connect(self, arg, opts):
425
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
133
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
134 '''Opens the DB connection'''
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
135 if opts.closeall:
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
136 self.closeall()
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
137 return
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
138 if opts.close:
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
139 if not arg:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
140 arg = self.instance_number
425
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
141 self.disconnect(arg)
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
142 return
438
39a664a87c51 excluded --options from --comments with .NotAny
catherine@bothari
parents: 436
diff changeset
143 if (not arg) and (not opts.postgres) and (not opts.mysql):
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
144 self.list_instances()
425
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
145 return
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
146 if self.successfully_connect_to_number(arg):
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
147 return
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
148
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
149 db_instance = connections.DatabaseInstance(arg, opts, default_rdbms = self.default_rdbms)
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
150 if opts.add or (self.instance_number is None):
425
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
151 try:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
152 self.instance_number = max(self.instances.keys()) + 1
425
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
153 except ValueError:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
154 self.instance_number = 0
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
155 db_instance.set_instance_number(self.instance_number)
429
76bf7f767c10 continuing connection transition
catherine@dellzilla
parents: 428
diff changeset
156 self.instances[self.instance_number] = db_instance
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
157 self.make_instance_current(self.instance_number)
425
06713eb8954e connect2 changes in progress
catherine@bothari
parents: 423
diff changeset
158 if (self.rdbms == 'oracle') and self.serveroutput:
431
cac7333f9ff5 beginning rework of threaded metadata discovery
catherine@dellzilla
parents: 430
diff changeset
159 self.current_instance.connection.cursor().callproc('dbms_output.enable',[])
cac7333f9ff5 beginning rework of threaded metadata discovery
catherine@dellzilla
parents: 430
diff changeset
160 #self.curs.callproc('dbms_output.enable', [])
407
188c86d4a11e struggling with option parsing
catherine@DellZilla
parents: 405
diff changeset
161
436
f441f2eb52e0 pickling gerald data
catherine@dellzilla
parents: 431
diff changeset
162 def do_pickle(self, arg):
f441f2eb52e0 pickling gerald data
catherine@dellzilla
parents: 431
diff changeset
163 self.current_instance.pickle()
f441f2eb52e0 pickling gerald data
catherine@dellzilla
parents: 431
diff changeset
164
259
c0847a4c7f49 one-shot connection changes
catherine@Elli.myhome.westell.com
parents: 258
diff changeset
165 def postparsing_precmd(self, statement):
c0847a4c7f49 one-shot connection changes
catherine@Elli.myhome.westell.com
parents: 258
diff changeset
166 stop = 0
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
167 self.saved_instance_number = None
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
168 if statement.parsed.instance_number:
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
169 saved_instance_number = self.instance_number
258
a94fec8155da multiple connections
catherine@Elli.myhome.westell.com
parents: 257
diff changeset
170 try:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
171 if self.successfully_connect_to_number(statement.parsed.instance_number):
335
00b183a103b3 bare prefix switches connection
Catherine Devlin <catherine.devlin@gmail.com>
parents: 324
diff changeset
172 if statement.parsed.command:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
173 self.saved_instance_number = saved_instance_number
261
0044cfa5867a disconnections worked out
catherine@dellzilla
parents: 260
diff changeset
174 except KeyError:
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
175 self.list_instances()
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
176 raise KeyError, 'No connection #%s' % statement.parsed.instance_number
259
c0847a4c7f49 one-shot connection changes
catherine@Elli.myhome.westell.com
parents: 258
diff changeset
177 return stop, statement
c0847a4c7f49 one-shot connection changes
catherine@Elli.myhome.westell.com
parents: 258
diff changeset
178 def postparsing_postcmd(self, stop):
428
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
179 if self.saved_instance_number is not None:
6cd30b785885 continuing connection transition
catherine@dellzilla
parents: 426
diff changeset
180 self.successfully_connect_to_number(self.saved_instance_number)
259
c0847a4c7f49 one-shot connection changes
catherine@Elli.myhome.westell.com
parents: 258
diff changeset
181 return stop
c0847a4c7f49 one-shot connection changes
catherine@Elli.myhome.westell.com
parents: 258
diff changeset
182
256
d09f16b71f66 do_host
catherine@Elli.myhome.westell.com
parents: 255
diff changeset
183 do_host = cmd2.Cmd.do_shell
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
184
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
185 def emptyline(self):
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
186 pass
264
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
187
265
041c656dc8e5 show err working nicely now
catherine@Elli.myhome.westell.com
parents: 264
diff changeset
188 def _show_errors(self, all_users=False, limit=None, mintime=None, targets=[]):
264
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
189 if all_users:
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
190 user = ''
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
191 else:
265
041c656dc8e5 show err working nicely now
catherine@Elli.myhome.westell.com
parents: 264
diff changeset
192 user = "AND ao.owner = user\n"
041c656dc8e5 show err working nicely now
catherine@Elli.myhome.westell.com
parents: 264
diff changeset
193 if targets:
041c656dc8e5 show err working nicely now
catherine@Elli.myhome.westell.com
parents: 264
diff changeset
194 target = 'AND (%s)\n' % ' OR '.join("ae.type || '/' || ae.name LIKE '%s'" %
041c656dc8e5 show err working nicely now
catherine@Elli.myhome.westell.com
parents: 264
diff changeset
195 t.upper().replace('*','%') for t in targets)
041c656dc8e5 show err working nicely now
catherine@Elli.myhome.westell.com
parents: 264
diff changeset
196 else:
041c656dc8e5 show err working nicely now
catherine@Elli.myhome.westell.com
parents: 264
diff changeset
197 target = ''
264
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
198 self.curs.execute('''
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
199 SELECT ae.owner, ae.name, ae.type, ae.position, ae.line, ae.attribute,
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
200 ae.text error_text,
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
201 src.text object_text,
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
202 ao.last_ddl_time
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
203 FROM all_errors ae
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
204 JOIN all_objects ao ON ( ae.owner = ao.owner
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
205 AND ae.name = ao.object_name
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
206 AND ae.type = ao.object_type)
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
207 JOIN all_source src ON ( ae.owner = src.owner
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
208 AND ae.name = src.name
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
209 AND ae.type = src.type
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
210 AND ae.line = src.line)
265
041c656dc8e5 show err working nicely now
catherine@Elli.myhome.westell.com
parents: 264
diff changeset
211 WHERE 1=1
041c656dc8e5 show err working nicely now
catherine@Elli.myhome.westell.com
parents: 264
diff changeset
212 %s%sORDER BY ao.last_ddl_time DESC''' % (user, target))
264
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
213 if limit is None:
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
214 errors = self.curs.fetchall()
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
215 else:
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
216 errors = self.curs.fetchmany(numRows = limit)
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
217 for err in errors:
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
218 if (mintime is not None) and (err[8] < mintime):
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
219 break
333
1cde0ec62e61 send up
Catherine Devlin <catherine.devlin@gmail.com>
parents: 324
diff changeset
220 self.poutput('%s at line %d of %s %s.%s:' % (err[5], err[4], err[2], err[0], err[1]))
1cde0ec62e61 send up
Catherine Devlin <catherine.devlin@gmail.com>
parents: 324
diff changeset
221 self.poutput(err[7])
1cde0ec62e61 send up
Catherine Devlin <catherine.devlin@gmail.com>
parents: 324
diff changeset
222 self.poutput((' ' * (err[3]-1)) + '^')
1cde0ec62e61 send up
Catherine Devlin <catherine.devlin@gmail.com>
parents: 324
diff changeset
223 self.poutput(err[6])
1cde0ec62e61 send up
Catherine Devlin <catherine.devlin@gmail.com>
parents: 324
diff changeset
224 self.poutput('\n')
264
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
225
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
226 def current_database_time(self):
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
227 self.curs.execute('select sysdate from dual')
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
228 return self.curs.fetchone()[0]
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
229
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
230 def do_terminators(self, arg):
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
231 """; standard Oracle format
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
232 \\c CSV (with headings)
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
233 \\C CSV (no headings)
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
234 \\g list
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
235 \\G aligned list
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
236 \\h HTML table
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
237 \\i INSERT statements
266
342e96de6de6 json not quite there
catherine@Elli.myhome.westell.com
parents: 265
diff changeset
238 \\j JSON
308
4d24fea42364 py scripts working again
catherine@Elli.myhome.westell.com
parents: 298
diff changeset
239 \\r ReStructured Text
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
240 \\s CSV (with headings)
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
241 \\S CSV (no headings)
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
242 \\t transposed
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
243 \\x XML
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
244 \\l line plot, with markers
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
245 \\L scatter plot (no lines)
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
246 \\b bar graph
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
247 \\p pie chart"""
333
1cde0ec62e61 send up
Catherine Devlin <catherine.devlin@gmail.com>
parents: 324
diff changeset
248 self.poutput(self.do_terminators.__doc__)
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
249
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
250 terminatorSearchString = '|'.join('\\' + d.split()[0] for d in do_terminators.__doc__.splitlines())
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
251
339
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
252 bindScanner = {'oracle': Parser(pyparsing.Literal(':') + pyparsing.Word( pyparsing.alphanums + "_$#" )),
407
188c86d4a11e struggling with option parsing
catherine@DellZilla
parents: 405
diff changeset
253 'postgres': Parser(pyparsing.Literal('%(') + legal_sql_word + ')s')}
340
001d01eeac90 bind vars for postgres
Catherine Devlin <catherine.devlin@gmail.com>
parents: 339
diff changeset
254 def findBinds(self, target, givenBindVars = {}):
339
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
255 result = givenBindVars
416
e7769bc81960 several changes to settables - incomplete
catherine@bothari
parents: 415
diff changeset
256 #TODO: A consistent bind style? As a setting, perhaps?
339
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
257 if self.rdbms in self.bindScanner:
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
258 for finding, startat, endat in self.bindScanner[self.rdbms].scanner.scanString(target):
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
259 varname = finding[1]
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
260 try:
340
001d01eeac90 bind vars for postgres
Catherine Devlin <catherine.devlin@gmail.com>
parents: 339
diff changeset
261 result[varname] = self.binds[varname]
339
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
262 except KeyError:
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
263 if not givenBindVars.has_key(varname):
420
eb7cbbb00395 better failure on missing bind vars
catherine@bothari
parents: 417
diff changeset
264 raise KeyError, 'Bind variable "%s" not defined.' % (varname)
339
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
265 return result
545f63b6ef42 supports bind variables in postgresql
Catherine Devlin <catherine.devlin@gmail.com>
parents: 338
diff changeset
266
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
267 def default(self, arg):
340
001d01eeac90 bind vars for postgres
Catherine Devlin <catherine.devlin@gmail.com>
parents: 339
diff changeset
268 self.varsUsed = self.findBinds(arg, givenBindVars={})
247
f0f293d83337 begin docs
catherine@dellzilla
parents: 246
diff changeset
269 ending_args = arg.lower().split()[-2:]
f0f293d83337 begin docs
catherine@dellzilla
parents: 246
diff changeset
270 if 'end' in ending_args:
246
b5d4a122354a can round-trip a package now
catherine@dellzilla
parents: 242
diff changeset
271 command = '%s %s;'
b5d4a122354a can round-trip a package now
catherine@dellzilla
parents: 242
diff changeset
272 else:
264
a8deaa38f11e show errors works. limiting ls
catherine@Elli.myhome.westell.com
parents: 263
diff changeset
273 command = '%s %s'
317
f200a222a936 beginning to set up metadata.py
Catherine Devlin <catherine.devlin@gmail.com>
parents: 315
diff changeset
274 if self.rdbms == 'oracle':
315
a0a36232983a url_connect
catherine@Elli.myhome.westell.com
parents: 313
diff changeset
275 current_time = self.current_database_time()
417
fc3e99c9e3e5 grep fixed on postgresql
catherine@bothari
parents: 416
diff changeset
276 commandstring = command % (arg.parsed.command, arg.parsed.args)
fc3e99c9e3e5 grep fixed on postgresql
catherine@bothari
parents: 416
diff changeset
277 self.curs.execute(commandstring, self.varsUsed)
276
0b7031c2229e autobind unit test failing
catherine@Elli.myhome.westell.com
parents: 266
diff changeset
278 executionmessage = '\nExecuted%s\n' % ((self.curs.rowcount > 0) and ' (%d rows)' % self.curs.rowcount or '')
317
f200a222a936 beginning to set up metadata.py
Catherine Devlin <catherine.devlin@gmail.com>
parents: 315
diff changeset
279 if self.rdbms == 'oracle':
315
a0a36232983a url_connect
catherine@Elli.myhome.westell.com
parents: 313
diff changeset
280 self._show_errors(all_users=True, limit=1, mintime=current_time)
333
1cde0ec62e61 send up
Catherine Devlin <catherine.devlin@gmail.com>
parents: 324
diff changeset
281 self.pfeedback(executionmessage)
198
b2d8bf5f89db merged with changes from work
catherine@Elli.myhome.westell.com
parents: 197
diff changeset
282
b2d8bf5f89db merged with changes from work
catherine@Elli.myhome.westell.com
parents: 197
diff changeset
283 def do_commit(self, arg=''):
b2d8bf5f89db merged with changes from work
catherine@Elli.myhome.westell.com
parents: 197
diff changeset
284 self.default(self.parsed('commit %s;' % (arg)))
b2d8bf5f89db merged with changes from work
catherine@Elli.myhome.westell.com
parents: 197
diff changeset
285 def do_rollback(self, arg=''):
b2d8bf5f89db merged with changes from work
catherine@Elli.myhome.westell.com
parents: 197
diff changeset
286 self.default(self.parsed('rollback %s;' % (arg)))
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
287 def do_quit(self, arg):
261
0044cfa5867a disconnections worked out
catherine@dellzilla
parents: 260
diff changeset
288 if self.commit_on_exit:
0044cfa5867a disconnections worked out
catherine@dellzilla
parents: 260
diff changeset
289 self.closeall()
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
290 return cmd2.Cmd.do_quit(self, None)
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
291 do_exit = do_quit
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
292 do_q = do_quit
337
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
293 def colorize(self, val, color):
443
cd015f2bff44 synch with work
catherine@Drou
parents: 440
diff changeset
294 if color not in self.colorcodes:
cd015f2bff44 synch with work
catherine@Drou
parents: 440
diff changeset
295 if (color % 2):
cd015f2bff44 synch with work
catherine@Drou
parents: 440
diff changeset
296 color = 'red'
cd015f2bff44 synch with work
catherine@Drou
parents: 440
diff changeset
297 else:
cd015f2bff44 synch with work
catherine@Drou
parents: 440
diff changeset
298 color = 'cyan'
cd015f2bff44 synch with work
catherine@Drou
parents: 440
diff changeset
299 return cmd2.Cmd.colorize(self, val, color)
400
8903d24575f0 desc works on code
catherine@DellZilla
parents: 396
diff changeset
300 def pmatrix(self,rows,maxlen=30,heading=True,restructuredtext=False):
337
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
301 '''prints a matrix, used by sqlpython to print queries' result sets'''
400
8903d24575f0 desc works on code
catherine@DellZilla
parents: 396
diff changeset
302 names = self.colnames
8903d24575f0 desc works on code
catherine@DellZilla
parents: 396
diff changeset
303 maxen = [len(n) for n in self.colnames]
337
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
304 toprint = []
400
8903d24575f0 desc works on code
catherine@DellZilla
parents: 396
diff changeset
305 rcols = range(len(self.colnames))
337
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
306 rrows = range(len(rows))
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
307 for i in rrows: # loops for all rows
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
308 rowsi = map(str, rows[i]) # current row to process
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
309 split = [] # service var is row split is needed
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
310 mustsplit = 0 # flag
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
311 for j in rcols:
400
8903d24575f0 desc works on code
catherine@DellZilla
parents: 396
diff changeset
312 if str(self.coltypes[j]) == "<type 'cx_Oracle.BINARY'>": # handles RAW columns
337
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
313 rowsi[j] = binascii.b2a_hex(rowsi[j])
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
314 maxen[j] = max(maxen[j], len(rowsi[j])) # computes max field length
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
315 if maxen[j] <= maxlen:
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
316 split.append('')
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
317 else: # split the line is 2 because field is too long
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
318 mustsplit = 1
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
319 maxen[j] = maxlen
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
320 split.append(rowsi[j][maxlen-1:2*maxlen-1])
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
321 rowsi[j] = rowsi[j][0:maxlen-1] # this implem. truncates after maxlen*2
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
322 toprint.append(rowsi) # 'toprint' is a printable copy of rows
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
323 if mustsplit != 0:
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
324 toprint.append(split)
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
325 sepcols = []
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
326 for i in rcols:
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
327 maxcol = maxen[i]
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
328 name = names[i]
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
329 sepcols.append("-" * maxcol) # formats column names (header)
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
330 names[i] = name + (" " * (maxcol-len(name))) # formats separ line with --
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
331 rrows2 = range(len(toprint))
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
332 for j in rrows2:
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
333 val = toprint[j][i]
400
8903d24575f0 desc works on code
catherine@DellZilla
parents: 396
diff changeset
334 if str(self.coltypes[i]) == "<type 'cx_Oracle.NUMBER'>": # right align numbers - but must generalize!
337
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
335 toprint[j][i] = (" " * (maxcol-len(val))) + val
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
336 else:
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
337 toprint[j][i] = val + (" " * (maxcol-len(val)))
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
338 toprint[j][i] = self.colorize(toprint[j][i], i)
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
339 for j in rrows2:
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
340 toprint[j] = ' '.join(toprint[j])
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
341 names = [self.colorize(name, n) for (n, name) in enumerate(names)]
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
342 names = ' '.join(names)
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
343 names = self.colorize(names, 'bold')
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
344 sepcols = ' '.join(sepcols)
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
345 if heading or restructuredtext:
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
346 toprint.insert(0, sepcols)
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
347 toprint.insert(0, names)
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
348 if restructuredtext:
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
349 toprint.insert(0, sepcols)
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
350 toprint.append(sepcols)
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
351 return '\n'.join(toprint)
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
352
337
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
353
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
354
Catherine Devlin <catherine.devlin@gmail.com>
parents: 333
diff changeset
355
189
c5398d87498e cat bug
catherine@dellzilla
parents:
diff changeset
356