Fix some tests.

This commit is contained in:
INADA Naoki
2014-04-18 11:29:10 +09:00
parent e8c1ebb5b7
commit f188e0f9e4
2 changed files with 7 additions and 5 deletions

View File

@ -212,8 +212,12 @@ class Connection(_mysql.connection):
return string_literal return string_literal
def _get_unicode_literal(): def _get_unicode_literal():
def unicode_literal(u, dummy=None): if PY2:
return db.literal(u.encode(unicode_literal.charset)) def unicode_literal(u, dummy=None):
return db.literal(u.encode(unicode_literal.charset))
else:
def unicode_literal(u, dummy=None):
return db.literal(str(u).encode(unicode_literal.charset))
return unicode_literal return unicode_literal
def _get_string_decoder(): def _get_string_decoder():

View File

@ -27,10 +27,8 @@ class DatabaseTest(unittest.TestCase):
db = connection_factory(**self.connect_kwargs) db = connection_factory(**self.connect_kwargs)
self.connection = db self.connection = db
self.cursor = db.cursor() 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 = u''.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)) self.BLOBBinary = self.db_module.Binary((u''.join([unichr(i) for i in range(256)] * 16)).encode('latin1'))
leak_test = True leak_test = True