summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-05-26 18:25:43 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-05-26 18:25:43 -0400
commit29689fa566ba1bd3dc08727754632c9e8074137c (patch)
tree28686b8e3a08ea59bed4fc70523d7112a285dccb /lib/sqlalchemy/testing
parent61c796786cb222cfdca611395d8550973fc3f8d5 (diff)
downloadsqlalchemy-29689fa566ba1bd3dc08727754632c9e8074137c.tar.gz
fix the unicode test suite
Diffstat (limited to 'lib/sqlalchemy/testing')
-rw-r--r--lib/sqlalchemy/testing/suite/test_types.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/sqlalchemy/testing/suite/test_types.py b/lib/sqlalchemy/testing/suite/test_types.py
index 4dd3884ed..0d8bfdc0f 100644
--- a/lib/sqlalchemy/testing/suite/test_types.py
+++ b/lib/sqlalchemy/testing/suite/test_types.py
@@ -10,14 +10,15 @@ from ..schema import Table, Column
from ... import testing
import decimal
import datetime
-
+from ...util import u
+from ... import util
class _UnicodeFixture(object):
__requires__ = 'unicode_data',
- data = "Alors vous imaginez ma surprise, au lever du jour, "\
+ data = u("Alors vous imaginez ma surprise, au lever du jour, "\
"quand une drôle de petite voix m’a réveillé. Elle "\
- "disait: « S’il vous plaît… dessine-moi un mouton! »"
+ "disait: « S’il vous plaît… dessine-moi un mouton! »")
@classmethod
def define_tables(cls, metadata):
@@ -47,7 +48,7 @@ class _UnicodeFixture(object):
row,
(self.data, )
)
- assert isinstance(row[0], str)
+ assert isinstance(row[0], util.text_type)
def test_round_trip_executemany(self):
unicode_table = self.tables.unicode_table
@@ -72,19 +73,19 @@ class _UnicodeFixture(object):
[(self.data, ) for i in range(3)]
)
for row in rows:
- assert isinstance(row[0], str)
+ assert isinstance(row[0], util.text_type)
def _test_empty_strings(self):
unicode_table = self.tables.unicode_table
config.db.execute(
unicode_table.insert(),
- {"unicode_data": ''}
+ {"unicode_data": u('')}
)
row = config.db.execute(
select([unicode_table.c.unicode_data])
).first()
- eq_(row, ('',))
+ eq_(row, (u(''),))
class UnicodeVarcharTest(_UnicodeFixture, fixtures.TablesTest):