# HG changeset patch # User catherine@cordelia # Date 1243887824 14400 # Node ID f42f92dc746419ff155e954d4d7bf781a3b54ea5 # Parent cdd403e73132fe77d356378c89920fa58a70fe99 silencing baseexception warnings diff -r cdd403e73132 -r f42f92dc7464 setup.py --- a/setup.py Thu May 28 17:37:20 2009 -0400 +++ b/setup.py Mon Jun 01 16:23:44 2009 -0400 @@ -17,7 +17,7 @@ url="http://packages.python.org/sqlpython", packages=find_packages(), include_package_data=True, - install_requires=['pyparsing','cmd2>=0.5.4','cx_Oracle>=5.0.1' + install_requires=['pyparsing','cmd2>=0.5.4','cx_Oracle>=5.0.1', 'genshi>=0.5','sqlalchemy'], keywords = 'client oracle database', license = 'MIT', diff -r cdd403e73132 -r f42f92dc7464 sqlpython/sqlpyPlus.py --- a/sqlpython/sqlpyPlus.py Thu May 28 17:37:20 2009 -0400 +++ b/sqlpython/sqlpyPlus.py Mon Jun 01 16:23:44 2009 -0400 @@ -29,6 +29,8 @@ from metadata import metaqueries from plothandler import Plot from sqlpython import Parser +import warnings +warnings.filterwarnings('ignore', 'BaseException.message', DeprecationWarning) try: import pylab except (RuntimeError, ImportError): @@ -313,6 +315,14 @@ return '', '', '' return cmd, arg, line + def perror(self, err, statement=None): + try: + linenum = statement.parsed.raw[:err.message.offset].count('\n') + print statement.parsed.raw.splitlines()[linenum] + print '%s^' % (' ' * (err.message.offset + len(self.prompt))) + except AttributeError: + pass + print str(err) def dbms_output(self): "Dumps contents of Oracle's DBMS_OUTPUT buffer (where PUT_LINE goes)" try: