diff options
| author | farcepest <farcepest@gmail.com> | 2012-09-26 16:02:05 -0400 |
|---|---|---|
| committer | farcepest <farcepest@gmail.com> | 2012-09-26 16:02:05 -0400 |
| commit | d1b43681cfe61adf994e9cb4cd495556eb712c6e (patch) | |
| tree | 3b26d77ce5ca3564ccd4aae311330890e550e43d /MySQLdb | |
| parent | 129f09ace4fe4e4cdbec8c0d39caa5f34583f16c (diff) | |
| download | mysqldb1-d1b43681cfe61adf994e9cb4cd495556eb712c6e.tar.gz | |
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.
Diffstat (limited to 'MySQLdb')
| -rw-r--r-- | MySQLdb/MySQLdb/connections.py | 2 | ||||
| -rw-r--r-- | 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 |