summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Podolyaka <roman.podolyaka@gmail.com>2013-06-23 12:04:21 +0300
committerRoman Podolyaka <roman.podolyaka@gmail.com>2013-06-23 12:57:53 +0300
commit25b4637bcde9bdc86240ce5eef834374a1203925 (patch)
tree5c39776e851a749809f6ad5c62d386836bde3dbe
parenteba9d1b58f38577fb71d3374a2133d6e9159c277 (diff)
downloadsqlalchemy-pr/10.tar.gz
Fix unicode literals on Python 3.1 and 3.2pr/10
A few tests use u'' unicode literals which are not supported in Python versions 3.1 and 3.2.
-rw-r--r--lib/sqlalchemy/testing/suite/test_select.py3
-rw-r--r--test/dialect/test_postgresql.py16
2 files changed, 10 insertions, 9 deletions
diff --git a/lib/sqlalchemy/testing/suite/test_select.py b/lib/sqlalchemy/testing/suite/test_select.py
index b040c8f25..b8a755b8c 100644
--- a/lib/sqlalchemy/testing/suite/test_select.py
+++ b/lib/sqlalchemy/testing/suite/test_select.py
@@ -1,6 +1,7 @@
from .. import fixtures, config
from ..assertions import eq_
+from sqlalchemy import util
from sqlalchemy import Integer, String, select, func
from ..schema import Table, Column
@@ -63,7 +64,7 @@ class OrderByLabelTest(fixtures.TablesTest):
ly = (func.lower(table.c.q) + table.c.p).label('ly')
self._assert_result(
select([lx, ly]).order_by(lx, ly.desc()),
- [(3, u'q1p3'), (5, u'q2p2'), (7, u'q3p1')]
+ [(3, util.u('q1p3')), (5, util.u('q2p2')), (7, util.u('q3p1'))]
)
def test_plain_desc(self):
diff --git a/test/dialect/test_postgresql.py b/test/dialect/test_postgresql.py
index 5b610bb40..46a7b316b 100644
--- a/test/dialect/test_postgresql.py
+++ b/test/dialect/test_postgresql.py
@@ -3265,17 +3265,17 @@ class HStoreRoundTripTest(fixtures.TablesTest):
def _test_unicode_round_trip(self, engine):
s = select([
- hstore(
- array([u'réveillé', u'drôle', u'S’il']),
- array([u'réveillé', u'drôle', u'S’il'])
- )
- ])
+ hstore(
+ array([util.u('réveillé'), util.u('drôle'), util.u('S’il')]),
+ array([util.u('réveillé'), util.u('drôle'), util.u('S’il')])
+ )
+ ])
eq_(
engine.scalar(s),
{
- u'réveillé': u'réveillé',
- u'drôle': u'drôle',
- u'S’il': u'S’il'
+ util.u('réveillé'): util.u('réveillé'),
+ util.u('drôle'): util.u('drôle'),
+ util.u('S’il'): util.u('S’il')
}
)