diff options
author | adustman <adustman@9fc6cd9a-920d-0410-adcf-ac96716ed7e8> | 2012-09-08 21:22:53 +0000 |
---|---|---|
committer | adustman <adustman@9fc6cd9a-920d-0410-adcf-ac96716ed7e8> | 2012-09-08 21:22:53 +0000 |
commit | 7676693b8f5f1b9ae62f40f4c872fc1e3777ba71 (patch) | |
tree | 70369e0df320b9271b403608009c0e32b5445401 /MySQLdb/tests | |
parent | 8041cc6df636b9c42d52e01b727aa98b43f3632c (diff) | |
download | mysqldb1-remotes/svn/MySQLdb-1.2.tar.gz |
More Python 3 fixes. Py 3 blows up when testing BLOBs.remotes/svn/MySQLdb-1.2
Diffstat (limited to 'MySQLdb/tests')
-rw-r--r-- | MySQLdb/tests/capabilities.py | 3 | ||||
-rw-r--r-- | MySQLdb/tests/test_MySQLdb_capabilities.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/MySQLdb/tests/capabilities.py b/MySQLdb/tests/capabilities.py index 0b508fa..6bb7436 100644 --- a/MySQLdb/tests/capabilities.py +++ b/MySQLdb/tests/capabilities.py @@ -24,8 +24,9 @@ class DatabaseTest(unittest.TestCase): db = self.db_module.connect(*self.connect_args, **self.connect_kwargs) self.connection = db self.cursor = db.cursor() + # TODO: this needs to be re-evaluated for Python 3 self.BLOBText = ''.join([chr(i) for i in range(256)] * 100); - self.BLOBUText = ''.join([unichr(i) for i in range(16384)]) + self.BLOBUText = u''.join([unichr(i) for i in range(16384)]) self.BLOBBinary = self.db_module.Binary(''.join([chr(i) for i in range(256)] * 16)) leak_test = True diff --git a/MySQLdb/tests/test_MySQLdb_capabilities.py b/MySQLdb/tests/test_MySQLdb_capabilities.py index a8f144a..98a2371 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[0] == ER.NO_SUCH_TABLE) + except self.connection.ProgrammingError as msg: + self.assertTrue(msg.args[0].args[0] == ER.NO_SUCH_TABLE) def test_bug_3514287(self): c = self.cursor |