Merge branch 'master' into ticket_1068

3 files changed, 14 insertions, 13 deletions

diff --git a/lib/sqlalchemy/testing/suite/test_ddl.py b/lib/sqlalchemy/testing/suite/test_ddl.py
index fc1c19362..28251b807 100644
--- a/lib/sqlalchemy/testing/suite/test_ddl.py
+++ b/lib/sqlalchemy/testing/suite/test_ddl.py
@@ -1,4 +1,4 @@
-from __future__ import with_statement
+
 
 from .. import fixtures, config, util
 from ..config import requirements
diff --git a/lib/sqlalchemy/testing/suite/test_reflection.py b/lib/sqlalchemy/testing/suite/test_reflection.py
index 7cae48572..ff76bd2cd 100644
--- a/lib/sqlalchemy/testing/suite/test_reflection.py
+++ b/lib/sqlalchemy/testing/suite/test_reflection.py
@@ -1,4 +1,4 @@
-from __future__ import with_statement
+
 
 import sqlalchemy as sa
 from sqlalchemy import exc as sa_exc
@@ -386,7 +386,7 @@ class ComponentReflectionTest(fixtures.TablesTest):
                     self.tables.email_addresses, self.tables.dingalings
         insp = inspect(meta.bind)
         oid = insp.get_table_oid(table_name, schema)
-        self.assert_(isinstance(oid, (int, long)))
+        self.assert_(isinstance(oid, int))
 
     def test_get_table_oid(self):
         self._test_get_table_oid('users')
diff --git a/lib/sqlalchemy/testing/suite/test_types.py b/lib/sqlalchemy/testing/suite/test_types.py
index 0716b1b91..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 = u"Alors vous imaginez ma surprise, au lever du jour, "\
-                u"quand une drôle de petite voix m’a réveillé. Elle "\
-                u"disait: « S’il vous plaît… dessine-moi un mouton! »"
+    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! »")
 
     @classmethod
     def define_tables(cls, metadata):
@@ -47,7 +48,7 @@ class _UnicodeFixture(object):
             row,
             (self.data, )
         )
-        assert isinstance(row[0], unicode)
+        assert isinstance(row[0], util.text_type)
 
     def test_round_trip_executemany(self):
         unicode_table = self.tables.unicode_table
@@ -58,7 +59,7 @@ class _UnicodeFixture(object):
                 {
                     'unicode_data': self.data,
                 }
-                for i in xrange(3)
+                for i in range(3)
             ]
         )
 
@@ -69,22 +70,22 @@ class _UnicodeFixture(object):
                 ).fetchall()
         eq_(
             rows,
-            [(self.data, ) for i in xrange(3)]
+            [(self.data, ) for i in range(3)]
         )
         for row in rows:
-            assert isinstance(row[0], unicode)
+            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": u''}
+            {"unicode_data": u('')}
         )
         row = config.db.execute(
                     select([unicode_table.c.unicode_data])
                 ).first()
-        eq_(row, (u'',))
+        eq_(row, (u(''),))
 
 
 class UnicodeVarcharTest(_UnicodeFixture, fixtures.TablesTest):