openstack/deb-python-pymysql
Code Issues Proposed changes

Py3k string normalization.

Browse Source
This commit is contained in:
Marcel Rodrigues
2013-07-17 02:26:25 -03:00
parent a8dd44d886
commit 0df8c10557
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pymysql/tests/thirdparty/test_MySQLdb/capabilities.py vendored
View File

@@ -10,6 +10,7 @@ from time import time
import array import array
import unittest import unittest
PY2 = sys.version_info[0] == 2
class DatabaseTest(unittest.TestCase): class DatabaseTest(unittest.TestCase):
@@ -26,7 +27,7 @@ class DatabaseTest(unittest.TestCase):
self.connection = db self.connection = db
self.cursor = db.cursor() self.cursor = db.cursor()
self.BLOBText = ''.join([chr(i) for i in range(256)] * 100); self.BLOBText = ''.join([chr(i) for i in range(256)] * 100);
if sys.version_info[0] == 2: if PY2:
self.BLOBUText = unicode().join(unichr(i) for i in range(16834)) self.BLOBUText = unicode().join(unichr(i) for i in range(16834))
else: else:
self.BLOBUText = "".join(chr(i) for i in range(16834)) self.BLOBUText = "".join(chr(i) for i in range(16834))
@@ -279,7 +280,10 @@ class DatabaseTest(unittest.TestCase):
if col == 0: if col == 0:
return row return row
else: else:
return self.BLOBBinary # 'BLOB\000Binary ' * 1024 if PY2:
return self.BLOBBinary # 'BLOB\000Binary ' * 1024
else:
return self.BLOBBinary.encode('utf8') # 'BLOB\000Binary ' * 1024
self.check_data_integrity( self.check_data_integrity(
('col1 INT','col2 LONG BYTE'), ('col1 INT','col2 LONG BYTE'),
generator) generator)
@@ -289,7 +293,10 @@ class DatabaseTest(unittest.TestCase):
if col == 0: if col == 0:
return row return row
else: else:
return self.BLOBBinary # 'BLOB\000Binary ' * 1024 if PY2:
return self.BLOBBinary # 'BLOB\000Binary ' * 1024
else:
return self.BLOBBinary.encode('utf8') # 'BLOB\000Binary ' * 1024
self.check_data_integrity( self.check_data_integrity(
('col1 INT','col2 BLOB'), ('col1 INT','col2 BLOB'),
generator) generator)