Author: darcy
Date: Sun Nov 8 13:01:14 2015
New Revision: 525
Log:
Current excepton handling so that it can run under Python 3.
Modified:
trunk/module/TEST_PyGreSQL_classic.py
trunk/module/TEST_PyGreSQL_dbapi20.py
Modified: trunk/module/TEST_PyGreSQL_classic.py
==============================================================================
--- trunk/module/TEST_PyGreSQL_classic.py Sun Nov 8 11:02:12 2015
(r524)
+++ trunk/module/TEST_PyGreSQL_classic.py Sun Nov 8 13:01:14 2015
(r525)
@@ -147,7 +147,7 @@
db.query("INSERT INTO _test_schema VALUES (1234)")
try:
db.query("INSERT INTO _test_schema VALUES (1234)")
- except DatabaseError, error:
+ except DatabaseError as error:
# currently PyGreSQL does not support IntegrityError
self.assert_(isinstance(error, ProgrammingError))
# the SQLSTATE error code for unique violation is 23505
@@ -325,14 +325,14 @@
else: test_list = unittest.getTestCaseNames(UtilityTest, 'test_')
if len(sys.argv) == 2 and sys.argv[1] == '-l':
- print '\n'.join(unittest.getTestCaseNames(UtilityTest, 'test_'))
+ print('\n'.join(unittest.getTestCaseNames(UtilityTest, 'test_')))
sys.exit(1)
for test_name in test_list:
try:
suite.addTest(UtilityTest(test_name))
except:
- print "\n ERROR: %s.\n" % sys.exc_value
+ print("\n ERROR: %s.\n" % sys.exc_value)
sys.exit(1)
rc = unittest.TextTestRunner(verbosity=1).run(suite)
Modified: trunk/module/TEST_PyGreSQL_dbapi20.py
==============================================================================
--- trunk/module/TEST_PyGreSQL_dbapi20.py Sun Nov 8 11:02:12 2015
(r524)
+++ trunk/module/TEST_PyGreSQL_dbapi20.py Sun Nov 8 13:01:14 2015
(r525)
@@ -103,7 +103,7 @@
cur = con.cursor()
try:
cur.execute("select 1/0")
- except pgdb.DatabaseError, error:
+ except pgdb.DatabaseError as error:
self.assert_(isinstance(error, pgdb.ProgrammingError))
# the SQLSTATE error code for division by zero is 22012
self.assertEqual(error.sqlstate, '22012')
@@ -211,7 +211,7 @@
with con:
cur.execute("insert into %s values (3)" % table)
cur.execute("insert into %s values (4)" % table)
- except con.ProgrammingError, error:
+ except con.ProgrammingError as error:
self.assertTrue('check' in str(error).lower())
with con:
cur.execute("insert into %s values (5)" % table)
@@ -221,7 +221,7 @@
cur.execute("insert into %s values (7)" % table)
cur.execute("insert into %s values (8)" % table)
raise ValueError('transaction should rollback')
- except ValueError, error:
+ except ValueError as error:
self.assertEqual(str(error), 'transaction should rollback')
with con:
cur.execute("insert into %s values (9)" % table)
_______________________________________________
PyGreSQL mailing list
[email protected]
https://mail.vex.net/mailman/listinfo.cgi/pygresql
