# HG changeset patch # User catherine@cordelia # Date 1251900737 14400 # Node ID 18330ebc1cc433dfdff2848da52160eee2cc6c35 # Parent fe0051d7f93422be4e3e8aa8e1c5796bbc2d28fe# Parent 71d510285e800911c1ed0fd4fda0a646da19cc29 merged version change to 1.6.8 diff -r fe0051d7f934 -r 18330ebc1cc4 .hgtags --- a/.hgtags Wed Sep 02 10:11:26 2009 -0400 +++ b/.hgtags Wed Sep 02 10:12:17 2009 -0400 @@ -15,3 +15,4 @@ 09bb5789e72de737998e31027873ae1422dd37a0 nogerald branch; 1.6.5 f65f74c948bca2d22a6aab5964a42076ea8e70f2 1.6.6 477f0bf652b2f754dd72671e04460f7f2743eae4 1.6.7 +9fc0da48b2c41576c7ab40a3260988ce1d7919da 1.6.8 diff -r fe0051d7f934 -r 18330ebc1cc4 setup.py --- a/setup.py Wed Sep 02 10:11:26 2009 -0400 +++ b/setup.py Wed Sep 02 10:12:17 2009 -0400 @@ -9,7 +9,7 @@ Operating System :: OS Independent""".splitlines() setup(name="sqlpython", - version="1.6.7", + version="1.6.8", description="Command-line interface to Oracle", long_description="Customizable alternative to Oracle's SQL*PLUS command-line interface", author="Luca Canali", diff -r fe0051d7f934 -r 18330ebc1cc4 sqlpython/mysqlpy.py --- a/sqlpython/mysqlpy.py Wed Sep 02 10:11:26 2009 -0400 +++ b/sqlpython/mysqlpy.py Wed Sep 02 10:12:17 2009 -0400 @@ -1,5 +1,5 @@ #!/usr/bin/python -# MySqlPy V1.6.7 +# MySqlPy V1.6.8 # Author: Luca.Canali@cern.ch # # @@ -14,9 +14,9 @@ class mysqlpy(sqlpyPlus): ''' -MySqlPy V1.6.7 - 'sqlplus in python' +MySqlPy V1.6.8 - 'sqlplus in python' Author: Luca.Canali@cern.ch -Rev: 1.6.7, 07-Jul-09 +Rev: 1.6.8, 02-Sep-09 Companion of SqlPython, a python module that reproduces Oracle's command line within python and sqlpyPlus. Major contributions by Catherine Devlin, http://catherinedevlin.blogspot.com diff -r fe0051d7f934 -r 18330ebc1cc4 sqlpython/sqlpython.py --- a/sqlpython/sqlpython.py Wed Sep 02 10:11:26 2009 -0400 +++ b/sqlpython/sqlpython.py Wed Sep 02 10:12:17 2009 -0400 @@ -1,16 +1,16 @@ # # SqlPython V1.6.7 # Author: Luca.Canali@cern.ch, Apr 2006 -# Rev 7-Jul-09 +# Rev 2-Sep-09 # A python module to reproduce Oracle's command line 'sqlplus-like' within python # Intended to allow easy customizations and extentions # Best used with the companion modules sqlpyPlus and mysqlpy # See also http://twiki.cern.ch/twiki/bin/view/PSSGroup/SqlPython -import cmd2, getpass, binascii, cx_Oracle, re, os, platform -import sqlalchemy, pyparsing, schemagroup -__version__ = '1.7.0' +import cmd2,getpass,binascii,cx_Oracle,re,os,platform +import sqlalchemy, pyparsing +__version__ = '1.6.8' class Parser(object): comment_def = "--" + ~ ('-' + pyparsing.CaselessKeyword('begin')) + pyparsing.ZeroOrMore(pyparsing.CharsNotIn("\n"))