# HG changeset patch # User catherine@cordelia # Date 1241008569 14400 # Node ID 09bb5789e72de737998e31027873ae1422dd37a0 # Parent 001d01eeac909bbbfa8264058b73b4e8a0707482 making the nogerald branch diff -r 001d01eeac90 -r 09bb5789e72d setup.py --- a/setup.py Thu Apr 09 15:54:08 2009 -0400 +++ b/setup.py Wed Apr 29 08:36:09 2009 -0400 @@ -9,7 +9,7 @@ Operating System :: OS Independent""".splitlines() setup(name="sqlpython", - version="1.6.4", + version="1.6.5", description="Command-line interface to Oracle", long_description="Customizable alternative to Oracle's SQL*PLUS command-line interface", author="Luca Canali", @@ -17,7 +17,7 @@ url="http://packages.python.org/sqlpython", packages=find_packages(), include_package_data=True, - install_requires=['pyparsing','cmd2>=0.5.2','cx_Oracle','genshi>=0.5','sqlalchemy','gerald'], + install_requires=['pyparsing','cmd2>=0.5.2','cx_Oracle','genshi>=0.5','sqlalchemy'], keywords = 'client oracle database', license = 'MIT', platforms = ['any'], diff -r 001d01eeac90 -r 09bb5789e72d sqlpython/mysqlpy.py --- a/sqlpython/mysqlpy.py Thu Apr 09 15:54:08 2009 -0400 +++ b/sqlpython/mysqlpy.py Wed Apr 29 08:36:09 2009 -0400 @@ -1,5 +1,5 @@ #!/usr/bin/python -# MySqlPy V1.6.4 +# MySqlPy V1.6.5 # Author: Luca.Canali@cern.ch # # @@ -14,9 +14,9 @@ class mysqlpy(sqlpyPlus): ''' -MySqlPy V1.6.4 - 'sqlplus in python' +MySqlPy V1.6.5 - 'sqlplus in python' Author: Luca.Canali@cern.ch -Rev: 1.6.4, 03-Apr-09 +Rev: 1.6.5, 29-Apr-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 001d01eeac90 -r 09bb5789e72d sqlpython/sqlpython.py --- a/sqlpython/sqlpython.py Thu Apr 09 15:54:08 2009 -0400 +++ b/sqlpython/sqlpython.py Wed Apr 29 08:36:09 2009 -0400 @@ -1,7 +1,7 @@ # -# SqlPython V1.6.4 +# SqlPython V1.6.5 # Author: Luca.Canali@cern.ch, Apr 2006 -# Rev 03-Apr-09 +# Rev 29-Apr-09 # # A python module to reproduce Oracle's command line 'sqlplus-like' within python # Intended to allow easy customizations and extentions @@ -10,7 +10,7 @@ import cmd2,getpass,binascii,cx_Oracle,re,os import sqlpyPlus, sqlalchemy, pyparsing -__version__ = '1.6.4' +__version__ = '1.6.5' class Parser(object): comment_def = "--" + ~ ('-' + pyparsing.CaselessKeyword('begin')) + pyparsing.ZeroOrMore(pyparsing.CharsNotIn("\n"))