From 048b70d90157d9526b89013b51b80afd70883292 Mon Sep 17 00:00:00 2001 From: farcepest Date: Wed, 26 Sep 2012 16:02:05 -0400 Subject: [PATCH] Fix MySQLdb1-1 Exception format incompatible with previous versions Unfortunately, when I broke this, I broke the test at the same time. That should have been a red flag. --- MySQLdb/MySQLdb/connections.py | 2 +- MySQLdb/tests/test_MySQLdb_capabilities.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MySQLdb/MySQLdb/connections.py b/MySQLdb/MySQLdb/connections.py index d281cbd..1d6fa82 100644 --- a/MySQLdb/MySQLdb/connections.py +++ b/MySQLdb/MySQLdb/connections.py @@ -33,7 +33,7 @@ def defaulterrorhandler(connection, cursor, errorclass, errorvalue): connection.messages.append(error) del cursor del connection - raise errorclass(errorvalue) + raise errorclass, errorvalue re_numeric_part = re.compile(r"^(\d+)") diff --git a/MySQLdb/tests/test_MySQLdb_capabilities.py b/MySQLdb/tests/test_MySQLdb_capabilities.py index 98a2371..a510468 100644 --- a/MySQLdb/tests/test_MySQLdb_capabilities.py +++ b/MySQLdb/tests/test_MySQLdb_capabilities.py @@ -77,8 +77,8 @@ class test_MySQLdb(capabilities.DatabaseTest): from MySQLdb.constants import ER try: self.cursor.execute("describe some_non_existent_table"); - except self.connection.ProgrammingError as msg: - self.assertTrue(msg.args[0].args[0] == ER.NO_SUCH_TABLE) + except self.connection.ProgrammingError, msg: + self.assertTrue(msg[0] == ER.NO_SUCH_TABLE) def test_bug_3514287(self): c = self.cursor