- the raw 2to3 run

- went through examples/ and cleaned out excess list() calls

9 files changed, 177 insertions, 177 deletions

diff --git a/test/orm/inheritance/test_assorted_poly.py b/test/orm/inheritance/test_assorted_poly.py
index e8e6ba82a..d05a22f39 100644
--- a/test/orm/inheritance/test_assorted_poly.py
+++ b/test/orm/inheritance/test_assorted_poly.py
@@ -18,7 +18,7 @@ from sqlalchemy.testing.schema import Table, Column
 
 class AttrSettable(object):
     def __init__(self, **kwargs):
-        [setattr(self, k, v) for k, v in kwargs.iteritems()]
+        [setattr(self, k, v) for k, v in kwargs.items()]
     def __repr__(self):
         return self.__class__.__name__ + "(%s)" % (hex(id(self)))
 
@@ -386,7 +386,7 @@ class RelationshipTest4(fixtures.MappedTest):
         # class definitions
         class Person(object):
             def __init__(self, **kwargs):
-                for key, value in kwargs.iteritems():
+                for key, value in kwargs.items():
                     setattr(self, key, value)
             def __repr__(self):
                 return "Ordinary person %s" % self.name
@@ -400,7 +400,7 @@ class RelationshipTest4(fixtures.MappedTest):
                         (self.name, self.longer_status)
         class Car(object):
             def __init__(self, **kwargs):
-                for key, value in kwargs.iteritems():
+                for key, value in kwargs.items():
                     setattr(self, key, value)
             def __repr__(self):
                 return "Car number %d" % self.car_id
@@ -512,7 +512,7 @@ class RelationshipTest5(fixtures.MappedTest):
 
         class Person(object):
             def __init__(self, **kwargs):
-                for key, value in kwargs.iteritems():
+                for key, value in kwargs.items():
                     setattr(self, key, value)
             def __repr__(self):
                 return "Ordinary person %s" % self.name
@@ -526,7 +526,7 @@ class RelationshipTest5(fixtures.MappedTest):
                         (self.name, self.longer_status)
         class Car(object):
             def __init__(self, **kwargs):
-                for key, value in kwargs.iteritems():
+                for key, value in kwargs.items():
                     setattr(self, key, value)
             def __repr__(self):
                 return "Car number %d" % self.car_id
@@ -646,7 +646,7 @@ class RelationshipTest7(fixtures.MappedTest):
 
         class PersistentObject(object):
             def __init__(self, **kwargs):
-                for key, value in kwargs.iteritems():
+                for key, value in kwargs.items():
                     setattr(self, key, value)
 
         class Status(PersistentObject):
@@ -838,7 +838,7 @@ class GenerativeTest(fixtures.TestBase, AssertsExecutionResults):
         # class definitions
         class PersistentObject(object):
             def __init__(self, **kwargs):
-                for key, value in kwargs.iteritems():
+                for key, value in kwargs.items():
                     setattr(self, key, value)
         class Status(PersistentObject):
             def __repr__(self):
@@ -968,7 +968,7 @@ class MultiLevelTest(fixtures.MappedTest):
     def test_threelevels(self):
         class Employee( object):
             def set( me, **kargs):
-                for k,v in kargs.iteritems(): setattr( me, k, v)
+                for k,v in kargs.items(): setattr( me, k, v)
                 return me
             def __str__(me):
                 return str(me.__class__.__name__)+':'+str(me.name)
diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py
index bbfa54383..afd63f2b4 100644
--- a/test/orm/inheritance/test_basic.py
+++ b/test/orm/inheritance/test_basic.py
@@ -1355,7 +1355,7 @@ class SyncCompileTest(fixtures.MappedTest):
     def _do_test(self, j1, j2):
         class A(object):
            def __init__(self, **kwargs):
-               for key, value in kwargs.items():
+               for key, value in list(kwargs.items()):
                     setattr(self, key, value)
 
         class B(A):
@@ -1830,7 +1830,7 @@ class OptimizedLoadTest(fixtures.MappedTest):
                 "SELECT sub.counter AS sub_counter, base.counter AS base_counter, "
                 "sub.counter2 AS sub_counter2 FROM base JOIN sub ON "
                 "base.id = sub.id WHERE base.id = :param_1",
-                lambda ctx:{u'param_1': s1.id}
+                lambda ctx:{'param_1': s1.id}
             ),
         )
 
@@ -1910,7 +1910,7 @@ class OptimizedLoadTest(fixtures.MappedTest):
                 "SELECT subsub.counter2 AS subsub_counter2, "
                 "sub.counter2 AS sub_counter2 FROM subsub, sub "
                 "WHERE :param_1 = sub.id AND sub.id = subsub.id",
-                lambda ctx:{u'param_1': s1.id}
+                lambda ctx:{'param_1': s1.id}
             ),
         )
 
@@ -2409,9 +2409,9 @@ class NameConflictTest(fixtures.MappedTest):
                     polymorphic_identity='foo')
         sess = create_session()
         f = Foo()
-        f.content_type = u'bar'
+        f.content_type = 'bar'
         sess.add(f)
         sess.flush()
         f_id = f.id
         sess.expunge_all()
-        assert sess.query(Content).get(f_id).content_type == u'bar'
+        assert sess.query(Content).get(f_id).content_type == 'bar'
diff --git a/test/orm/inheritance/test_concrete.py b/test/orm/inheritance/test_concrete.py
index 40c3ab31b..5d6b82a15 100644
--- a/test/orm/inheritance/test_concrete.py
+++ b/test/orm/inheritance/test_concrete.py
@@ -722,10 +722,10 @@ class ColKeysTest(fixtures.MappedTest):
     @classmethod
     def insert_data(cls):
         refugees_table.insert().execute(dict(refugee_fid=1,
-                name=u'refugee1'), dict(refugee_fid=2, name=u'refugee2'
+                name='refugee1'), dict(refugee_fid=2, name='refugee2'
                 ))
         offices_table.insert().execute(dict(office_fid=1,
-                name=u'office1'), dict(office_fid=2, name=u'office2'))
+                name='office1'), dict(office_fid=2, name='office2'))
 
     def test_keys(self):
         pjoin = polymorphic_union({'refugee': refugees_table, 'office'
diff --git a/test/orm/inheritance/test_magazine.py b/test/orm/inheritance/test_magazine.py
index ae5aa8c8d..b459a01ae 100644
--- a/test/orm/inheritance/test_magazine.py
+++ b/test/orm/inheritance/test_magazine.py
@@ -8,7 +8,7 @@ from sqlalchemy.testing.schema import Table, Column
 
 class BaseObject(object):
     def __init__(self, *args, **kwargs):
-        for key, value in kwargs.iteritems():
+        for key, value in kwargs.items():
             setattr(self, key, value)
 class Publication(BaseObject):
     pass
@@ -200,15 +200,15 @@ def _generate_round_trip_test(use_unions=False, use_joins=False):
 
 
         session.flush()
-        print [x for x in session]
+        print([x for x in session])
         session.expunge_all()
 
         session.flush()
         session.expunge_all()
         p = session.query(Publication).filter(Publication.name=="Test").one()
 
-        print p.issues[0].locations[0].magazine.pages
-        print [page, page2, page3]
+        print(p.issues[0].locations[0].magazine.pages)
+        print([page, page2, page3])
         assert repr(p.issues[0].locations[0].magazine.pages) == repr([page, page2, page3]), repr(p.issues[0].locations[0].magazine.pages)
 
     test_roundtrip = function_named(
diff --git a/test/orm/inheritance/test_manytomany.py b/test/orm/inheritance/test_manytomany.py
index e4df5d133..31c4ba40a 100644
--- a/test/orm/inheritance/test_manytomany.py
+++ b/test/orm/inheritance/test_manytomany.py
@@ -42,7 +42,7 @@ class InheritTest(fixtures.MappedTest):
     def testbasic(self):
         class Principal(object):
             def __init__(self, **kwargs):
-                for key, value in kwargs.iteritems():
+                for key, value in kwargs.items():
                     setattr(self, key, value)
 
         class User(Principal):
@@ -94,8 +94,8 @@ class InheritTest2(fixtures.MappedTest):
 
         mapper(Foo, foo)
         mapper(Bar, bar, inherits=Foo)
-        print foo.join(bar).primary_key
-        print class_mapper(Bar).primary_key
+        print(foo.join(bar).primary_key)
+        print(class_mapper(Bar).primary_key)
         b = Bar('somedata')
         sess = create_session()
         sess.add(b)
@@ -133,8 +133,8 @@ class InheritTest2(fixtures.MappedTest):
         sess.expunge_all()
 
         l = sess.query(Bar).all()
-        print l[0]
-        print l[0].foos
+        print(l[0])
+        print(l[0].foos)
         self.assert_unordered_result(l, Bar,
 #            {'id':1, 'data':'barfoo', 'bid':1, 'foos':(Foo, [{'id':2,'data':'subfoo1'}, {'id':3,'data':'subfoo2'}])},
             {'id':b.id, 'data':'barfoo', 'foos':(Foo, [{'id':f1.id,'data':'subfoo1'}, {'id':f2.id,'data':'subfoo2'}])},
@@ -197,7 +197,7 @@ class InheritTest3(fixtures.MappedTest):
         compare = [repr(b)] + sorted([repr(o) for o in b.foos])
         sess.expunge_all()
         l = sess.query(Bar).all()
-        print repr(l[0]) + repr(l[0].foos)
+        print(repr(l[0]) + repr(l[0].foos))
         found = [repr(l[0])] + sorted([repr(o) for o in l[0].foos])
         eq_(found, compare)
 
@@ -239,11 +239,11 @@ class InheritTest3(fixtures.MappedTest):
         sess.expunge_all()
 
         l = sess.query(Blub).all()
-        print l
+        print(l)
         self.assert_(repr(l[0]) == compare)
         sess.expunge_all()
         x = sess.query(Blub).filter_by(id=blubid).one()
-        print x
+        print(x)
         self.assert_(repr(x) == compare)
 
 
diff --git a/test/orm/inheritance/test_polymorphic_rel.py b/test/orm/inheritance/test_polymorphic_rel.py
index 1b9acb787..8c1f22114 100644
--- a/test/orm/inheritance/test_polymorphic_rel.py
+++ b/test/orm/inheritance/test_polymorphic_rel.py
@@ -7,7 +7,7 @@ from sqlalchemy import exc as sa_exc
 from sqlalchemy import testing
 from sqlalchemy.testing import assert_raises, eq_
 
-from _poly_fixtures import Company, Person, Engineer, Manager, Boss, \
+from ._poly_fixtures import Company, Person, Engineer, Manager, Boss, \
     Machine, Paperwork, _Polymorphic,\
     _PolymorphicPolymorphic, _PolymorphicUnions, _PolymorphicJoins,\
     _PolymorphicAliasedJoins
@@ -118,24 +118,24 @@ class _PolymorphicTestBase(object):
         eq_(q.count(), 1)
         eq_(q.all(), [
             (
-                Company(company_id=1, name=u'MegaCorp, Inc.'),
+                Company(company_id=1, name='MegaCorp, Inc.'),
                 Engineer(
-                    status=u'regular engineer',
-                    engineer_name=u'dilbert',
-                    name=u'dilbert',
+                    status='regular engineer',
+                    engineer_name='dilbert',
+                    name='dilbert',
                     company_id=1,
-                    primary_language=u'java',
+                    primary_language='java',
                     person_id=1,
-                    type=u'engineer'),
-                Company(company_id=1, name=u'MegaCorp, Inc.'),
+                    type='engineer'),
+                Company(company_id=1, name='MegaCorp, Inc.'),
                 Engineer(
-                    status=u'regular engineer',
-                    engineer_name=u'wally',
-                    name=u'wally',
+                    status='regular engineer',
+                    engineer_name='wally',
+                    name='wally',
                     company_id=1,
-                    primary_language=u'c++',
+                    primary_language='c++',
                     person_id=2,
-                    type=u'engineer')
+                    type='engineer')
             )
         ])
 
@@ -337,8 +337,8 @@ class _PolymorphicTestBase(object):
         sess = create_session()
 
         expected = [
-            (u'dogbert',),
-            (u'pointy haired boss',)]
+            ('dogbert',),
+            ('pointy haired boss',)]
         eq_(sess.query(Manager.name)
                 .order_by(Manager.name).all(),
             expected)
@@ -346,9 +346,9 @@ class _PolymorphicTestBase(object):
     def test_join_from_columns_or_subclass_two(self):
         sess = create_session()
         expected = [
-            (u'dogbert',),
-            (u'dogbert',),
-            (u'pointy haired boss',)]
+            ('dogbert',),
+            ('dogbert',),
+            ('pointy haired boss',)]
         eq_(sess.query(Manager.name)
                 .join(Paperwork, Manager.paperwork)
                 .order_by(Manager.name).all(),
@@ -357,14 +357,14 @@ class _PolymorphicTestBase(object):
     def test_join_from_columns_or_subclass_three(self):
         sess = create_session()
         expected = [
-            (u'dilbert',),
-            (u'dilbert',),
-            (u'dogbert',),
-            (u'dogbert',),
-            (u'pointy haired boss',),
-            (u'vlad',),
-            (u'wally',),
-            (u'wally',)]
+            ('dilbert',),
+            ('dilbert',),
+            ('dogbert',),
+            ('dogbert',),
+            ('pointy haired boss',),
+            ('vlad',),
+            ('wally',),
+            ('wally',)]
         eq_(sess.query(Person.name)
                 .join(Paperwork, Person.paperwork)
                 .order_by(Person.name).all(),
@@ -375,14 +375,14 @@ class _PolymorphicTestBase(object):
         # Load Person.name, joining from Person -> paperwork, get all
         # the people.
         expected = [
-            (u'dilbert',),
-            (u'dilbert',),
-            (u'dogbert',),
-            (u'dogbert',),
-            (u'pointy haired boss',),
-            (u'vlad',),
-            (u'wally',),
-            (u'wally',)]
+            ('dilbert',),
+            ('dilbert',),
+            ('dogbert',),
+            ('dogbert',),
+            ('pointy haired boss',),
+            ('vlad',),
+            ('wally',),
+            ('wally',)]
         eq_(sess.query(Person.name)
                 .join(paperwork,
                       Person.person_id == paperwork.c.person_id)
@@ -393,9 +393,9 @@ class _PolymorphicTestBase(object):
         sess = create_session()
         # same, on manager.  get only managers.
         expected = [
-            (u'dogbert',),
-            (u'dogbert',),
-            (u'pointy haired boss',)]
+            ('dogbert',),
+            ('dogbert',),
+            ('pointy haired boss',)]
         eq_(sess.query(Manager.name)
                 .join(paperwork,
                       Manager.person_id == paperwork.c.person_id)
@@ -418,14 +418,14 @@ class _PolymorphicTestBase(object):
             # here, it joins to the full result set.  This is 0.6's
             # behavior and is more or less wrong.
             expected = [
-                (u'dilbert',),
-                (u'dilbert',),
-                (u'dogbert',),
-                (u'dogbert',),
-                (u'pointy haired boss',),
-                (u'vlad',),
-                (u'wally',),
-                (u'wally',)]
+                ('dilbert',),
+                ('dilbert',),
+                ('dogbert',),
+                ('dogbert',),
+                ('pointy haired boss',),
+                ('vlad',),
+                ('wally',),
+                ('wally',)]
             eq_(sess.query(Person.name)
                     .join(paperwork,
                           Manager.person_id == paperwork.c.person_id)
@@ -435,9 +435,9 @@ class _PolymorphicTestBase(object):
             # when a join is present and managers.person_id is available,
             # you get the managers.
             expected = [
-                (u'dogbert',),
-                (u'dogbert',),
-                (u'pointy haired boss',)]
+                ('dogbert',),
+                ('dogbert',),
+                ('pointy haired boss',)]
             eq_(sess.query(Person.name)
                     .join(paperwork,
                           Manager.person_id == paperwork.c.person_id)
@@ -454,9 +454,9 @@ class _PolymorphicTestBase(object):
     def test_join_from_columns_or_subclass_eight(self):
         sess = create_session()
         expected = [
-            (u'dogbert',),
-            (u'dogbert',),
-            (u'pointy haired boss',)]
+            ('dogbert',),
+            ('dogbert',),
+            ('pointy haired boss',)]
         eq_(sess.query(Manager.name)
                 .join(paperwork,
                       Manager.person_id == paperwork.c.person_id)
@@ -474,9 +474,9 @@ class _PolymorphicTestBase(object):
     def test_join_from_columns_or_subclass_ten(self):
         sess = create_session()
         expected = [
-            (u'pointy haired boss', u'review #1'),
-            (u'dogbert', u'review #2'),
-            (u'dogbert', u'review #3')]
+            ('pointy haired boss', 'review #1'),
+            ('dogbert', 'review #2'),
+            ('dogbert', 'review #3')]
         eq_(sess.query(Manager.name, Paperwork.description)
                 .join(Paperwork,
                       Manager.person_id == Paperwork.person_id)
@@ -486,9 +486,9 @@ class _PolymorphicTestBase(object):
     def test_join_from_columns_or_subclass_eleven(self):
         sess = create_session()
         expected = [
-            (u'pointy haired boss',),
-            (u'dogbert',),
-            (u'dogbert',)]
+            ('pointy haired boss',),
+            ('dogbert',),
+            ('dogbert',)]
         malias = aliased(Manager)
         eq_(sess.query(malias.name)
                 .join(paperwork,
@@ -977,32 +977,32 @@ class _PolymorphicTestBase(object):
 
         expected = [
             (Engineer(
-                status=u'regular engineer',
-                engineer_name=u'dilbert',
-                name=u'dilbert',
+                status='regular engineer',
+                engineer_name='dilbert',
+                name='dilbert',
                 company_id=1,
-                primary_language=u'java',
+                primary_language='java',
                 person_id=1,
-                type=u'engineer'),
-            u'MegaCorp, Inc.'),
+                type='engineer'),
+            'MegaCorp, Inc.'),
             (Engineer(
-                status=u'regular engineer',
-                engineer_name=u'wally',
-                name=u'wally',
+                status='regular engineer',
+                engineer_name='wally',
+                name='wally',
                 company_id=1,
-                primary_language=u'c++',
+                primary_language='c++',
                 person_id=2,
-                type=u'engineer'),
-            u'MegaCorp, Inc.'),
+                type='engineer'),
+            'MegaCorp, Inc.'),
             (Engineer(
-                status=u'elbonian engineer',
-                engineer_name=u'vlad',
-                name=u'vlad',
+                status='elbonian engineer',
+                engineer_name='vlad',
+                name='vlad',
                 company_id=2,
-                primary_language=u'cobol',
+                primary_language='cobol',
                 person_id=5,
-                type=u'engineer'),
-            u'Elbonia, Inc.')]
+                type='engineer'),
+            'Elbonia, Inc.')]
         eq_(sess.query(Engineer, Company.name)
                 .join(Company.employees)
                 .filter(Person.type == 'engineer').all(),
@@ -1011,9 +1011,9 @@ class _PolymorphicTestBase(object):
     def test_mixed_entities_two(self):
         sess = create_session()
         expected = [
-            (u'java', u'MegaCorp, Inc.'),
-            (u'cobol', u'Elbonia, Inc.'),
-            (u'c++', u'MegaCorp, Inc.')]
+            ('java', 'MegaCorp, Inc.'),
+            ('cobol', 'Elbonia, Inc.'),
+            ('c++', 'MegaCorp, Inc.')]
         eq_(sess.query(Engineer.primary_language, Company.name)
                 .join(Company.employees)
                 .filter(Person.type == 'engineer')
@@ -1025,19 +1025,19 @@ class _PolymorphicTestBase(object):
         palias = aliased(Person)
         expected = [(
             Engineer(
-                status=u'elbonian engineer',
-                engineer_name=u'vlad',
-                name=u'vlad',
-                primary_language=u'cobol'),
-            u'Elbonia, Inc.',
+                status='elbonian engineer',
+                engineer_name='vlad',
+                name='vlad',
+                primary_language='cobol'),
+            'Elbonia, Inc.',
             Engineer(
-                status=u'regular engineer',
-                engineer_name=u'dilbert',
-                name=u'dilbert',
+                status='regular engineer',
+                engineer_name='dilbert',
+                name='dilbert',
                 company_id=1,
-                primary_language=u'java',
+                primary_language='java',
                 person_id=1,
-                type=u'engineer'))]
+                type='engineer'))]
         eq_(sess.query(Person, Company.name, palias)
                 .join(Company.employees)
                 .filter(Company.name == 'Elbonia, Inc.')
@@ -1049,19 +1049,19 @@ class _PolymorphicTestBase(object):
         palias = aliased(Person)
         expected = [(
             Engineer(
-                status=u'regular engineer',
-                engineer_name=u'dilbert',
-                name=u'dilbert',
+                status='regular engineer',
+                engineer_name='dilbert',
+                name='dilbert',
                 company_id=1,
-                primary_language=u'java',
+                primary_language='java',
                 person_id=1,
-                type=u'engineer'),
-            u'Elbonia, Inc.',
+                type='engineer'),
+            'Elbonia, Inc.',
             Engineer(
-                status=u'elbonian engineer',
-                engineer_name=u'vlad',
-                name=u'vlad',
-                primary_language=u'cobol'),)]
+                status='elbonian engineer',
+                engineer_name='vlad',
+                name='vlad',
+                primary_language='cobol'),)]
         eq_(sess.query(palias, Company.name, Person)
                 .join(Company.employees)
                 .filter(Company.name == 'Elbonia, Inc.')
@@ -1071,7 +1071,7 @@ class _PolymorphicTestBase(object):
     def test_mixed_entities_five(self):
         sess = create_session()
         palias = aliased(Person)
-        expected = [(u'vlad', u'Elbonia, Inc.', u'dilbert')]
+        expected = [('vlad', 'Elbonia, Inc.', 'dilbert')]
         eq_(sess.query(Person.name, Company.name, palias.name)
                 .join(Company.employees)
                 .filter(Company.name == 'Elbonia, Inc.')
@@ -1082,9 +1082,9 @@ class _PolymorphicTestBase(object):
         sess = create_session()
         palias = aliased(Person)
         expected = [
-            (u'manager', u'dogbert', u'engineer', u'dilbert'),
-            (u'manager', u'dogbert', u'engineer', u'wally'),
-            (u'manager', u'dogbert', u'boss', u'pointy haired boss')]
+            ('manager', 'dogbert', 'engineer', 'dilbert'),
+            ('manager', 'dogbert', 'engineer', 'wally'),
+            ('manager', 'dogbert', 'boss', 'pointy haired boss')]
         eq_(sess.query(Person.type, Person.name, palias.type, palias.name)
                 .filter(Person.company_id == palias.company_id)
                 .filter(Person.name == 'dogbert')
@@ -1095,14 +1095,14 @@ class _PolymorphicTestBase(object):
     def test_mixed_entities_seven(self):
         sess = create_session()
         expected = [
-            (u'dilbert', u'tps report #1'),
-            (u'dilbert', u'tps report #2'),
-            (u'dogbert', u'review #2'),
-            (u'dogbert', u'review #3'),
-            (u'pointy haired boss', u'review #1'),
-            (u'vlad', u'elbonian missive #3'),
-            (u'wally', u'tps report #3'),
-            (u'wally', u'tps report #4')]
+            ('dilbert', 'tps report #1'),
+            ('dilbert', 'tps report #2'),
+            ('dogbert', 'review #2'),
+            ('dogbert', 'review #3'),
+            ('pointy haired boss', 'review #1'),
+            ('vlad', 'elbonian missive #3'),
+            ('wally', 'tps report #3'),
+            ('wally', 'tps report #4')]
         eq_(sess.query(Person.name, Paperwork.description)
                 .filter(Person.person_id == Paperwork.person_id)
                 .order_by(Person.name, Paperwork.description).all(),
@@ -1116,7 +1116,7 @@ class _PolymorphicTestBase(object):
 
     def test_mixed_entities_nine(self):
         sess = create_session()
-        expected = [(u'Elbonia, Inc.', 1), (u'MegaCorp, Inc.', 4)]
+        expected = [('Elbonia, Inc.', 1), ('MegaCorp, Inc.', 4)]
         eq_(sess.query(Company.name, func.count(Person.person_id))
                 .filter(Company.company_id == Person.company_id)
                 .group_by(Company.name)
@@ -1125,7 +1125,7 @@ class _PolymorphicTestBase(object):
 
     def test_mixed_entities_ten(self):
         sess = create_session()
-        expected = [(u'Elbonia, Inc.', 1), (u'MegaCorp, Inc.', 4)]
+        expected = [('Elbonia, Inc.', 1), ('MegaCorp, Inc.', 4)]
         eq_(sess.query(Company.name, func.count(Person.person_id))
                 .join(Company.employees)
                 .group_by(Company.name)
@@ -1153,14 +1153,14 @@ class _PolymorphicTestBase(object):
 
     def test_mixed_entities_eleven(self):
         sess = create_session()
-        expected = [(u'java',), (u'c++',), (u'cobol',)]
+        expected = [('java',), ('c++',), ('cobol',)]
         eq_(sess.query(Engineer.primary_language)
                 .filter(Person.type == 'engineer').all(),
             expected)
 
     def test_mixed_entities_twelve(self):
         sess = create_session()
-        expected = [(u'vlad', u'Elbonia, Inc.')]
+        expected = [('vlad', 'Elbonia, Inc.')]
         eq_(sess.query(Person.name, Company.name)
                 .join(Company.employees)
                 .filter(Company.name == 'Elbonia, Inc.').all(),
@@ -1168,15 +1168,15 @@ class _PolymorphicTestBase(object):
 
     def test_mixed_entities_thirteen(self):
         sess = create_session()
-        expected = [(u'pointy haired boss', u'fore')]
+        expected = [('pointy haired boss', 'fore')]
         eq_(sess.query(Boss.name, Boss.golf_swing).all(), expected)
 
     def test_mixed_entities_fourteen(self):
         sess = create_session()
         expected = [
-            (u'dilbert', u'java'),
-            (u'wally', u'c++'),
-            (u'vlad', u'cobol')]
+            ('dilbert', 'java'),
+            ('wally', 'c++'),
+            ('vlad', 'cobol')]
         eq_(sess.query(Engineer.name, Engineer.primary_language).all(),
             expected)
 
@@ -1184,12 +1184,12 @@ class _PolymorphicTestBase(object):
         sess = create_session()
 
         expected = [(
-            u'Elbonia, Inc.',
+            'Elbonia, Inc.',
             Engineer(
-                status=u'elbonian engineer',
-                engineer_name=u'vlad',
-                name=u'vlad',
-                primary_language=u'cobol'))]
+                status='elbonian engineer',
+                engineer_name='vlad',
+                name='vlad',
+                primary_language='cobol'))]
         eq_(sess.query(Company.name, Person)
                 .join(Company.employees)
                 .filter(Company.name == 'Elbonia, Inc.').all(),
@@ -1199,11 +1199,11 @@ class _PolymorphicTestBase(object):
         sess = create_session()
         expected = [(
             Engineer(
-                status=u'elbonian engineer',
-                engineer_name=u'vlad',
-                name=u'vlad',
-                primary_language=u'cobol'),
-            u'Elbonia, Inc.')]
+                status='elbonian engineer',
+                engineer_name='vlad',
+                name='vlad',
+                primary_language='cobol'),
+            'Elbonia, Inc.')]
         eq_(sess.query(Person, Company.name)
                 .join(Company.employees)
                 .filter(Company.name == 'Elbonia, Inc.').all(),
diff --git a/test/orm/inheritance/test_productspec.py b/test/orm/inheritance/test_productspec.py
index c1e99e338..3de5e3695 100644
--- a/test/orm/inheritance/test_productspec.py
+++ b/test/orm/inheritance/test_productspec.py
@@ -122,8 +122,8 @@ class InheritTest(fixtures.MappedTest):
 
         a1 = session.query(Product).filter_by(name='a1').one()
         new = repr(a1)
-        print orig
-        print new
+        print(orig)
+        print(new)
         assert orig == new == '<Assembly a1> specification=[<SpecLine 1.0 <Product p1>>, <SpecLine 1.0 <Detail d1>>] documents=None'
 
     def testtwo(self):
@@ -153,8 +153,8 @@ class InheritTest(fixtures.MappedTest):
         session.flush()
         session.expunge_all()
         new = repr(session.query(SpecLine).all())
-        print orig
-        print new
+        print(orig)
+        print(new)
         assert orig == new == '[<SpecLine 1.0 <Product p1>>, <SpecLine 1.0 <Detail d1>>]'
 
     def testthree(self):
@@ -206,8 +206,8 @@ class InheritTest(fixtures.MappedTest):
 
         a1 = session.query(Product).filter_by(name='a1').one()
         new = repr(a1)
-        print orig
-        print new
+        print(orig)
+        print(new)
         assert orig == new  == '<Assembly a1> specification=[<SpecLine 1.0 <Detail d1>>] documents=[<Document doc1>, <RasterDocument doc2>]'
 
     def testfour(self):
@@ -245,8 +245,8 @@ class InheritTest(fixtures.MappedTest):
 
         a1 = session.query(Product).filter_by(name='a1').one()
         new = repr(a1)
-        print orig
-        print new
+        print(orig)
+        print(new)
         assert orig == new  == '<Assembly a1> specification=None documents=[<RasterDocument doc2>]'
 
         del a1.documents[0]
@@ -312,7 +312,7 @@ class InheritTest(fixtures.MappedTest):
 
         a1 = session.query(Product).filter_by(name='a1').one()
         new = repr(a1)
-        print orig
-        print new
+        print(orig)
+        print(new)
         assert orig == new  == '<Assembly a1> specification=[<SpecLine 1.0 <Detail d1>>] documents=[<Document doc1>, <RasterDocument doc2>]'
 
diff --git a/test/orm/inheritance/test_relationship.py b/test/orm/inheritance/test_relationship.py
index 36dbb7d27..809884f52 100644
--- a/test/orm/inheritance/test_relationship.py
+++ b/test/orm/inheritance/test_relationship.py
@@ -287,7 +287,7 @@ class SelfReferentialJ2JSelfTest(fixtures.MappedTest):
     def _five_obj_fixture(self):
         sess = Session()
         e1, e2, e3, e4, e5 = [
-            Engineer(name='e%d' % (i + 1)) for i in xrange(5)
+            Engineer(name='e%d' % (i + 1)) for i in range(5)
         ]
         e3.reports_to = e1
         e4.reports_to = e2
diff --git a/test/orm/inheritance/test_with_poly.py b/test/orm/inheritance/test_with_poly.py
index 93cccee7a..87251a4c2 100644
--- a/test/orm/inheritance/test_with_poly.py
+++ b/test/orm/inheritance/test_with_poly.py
@@ -11,7 +11,7 @@ from sqlalchemy import testing
 from sqlalchemy.testing.schema import Table, Column
 from sqlalchemy.testing import assert_raises, eq_
 
-from _poly_fixtures import Company, Person, Engineer, Manager, Boss, \
+from ._poly_fixtures import Company, Person, Engineer, Manager, Boss, \
     Machine, Paperwork, _PolymorphicFixtureBase, _Polymorphic,\
     _PolymorphicPolymorphic, _PolymorphicUnions, _PolymorphicJoins,\
     _PolymorphicAliasedJoins
@@ -37,8 +37,8 @@ class _WithPolymorphicBase(_PolymorphicFixtureBase):
                                 pa.Manager.manager_name=='dogbert')).\
                 order_by(pa.Engineer.type).all(),
             [
-                (u'dilbert', u'java', None),
-                (u'dogbert', None, u'dogbert'),
+                ('dilbert', 'java', None),
+                ('dogbert', None, 'dogbert'),
             ]
         )
 
@@ -63,10 +63,10 @@ class _WithPolymorphicBase(_PolymorphicFixtureBase):
                     )
                 ).order_by(pa.name, pa_alias.name)],
             [
-                (u'dilbert', Engineer, u'dilbert', Engineer),
-                (u'dogbert', Manager, u'pointy haired boss', Boss),
-                (u'vlad', Engineer, u'vlad', Engineer),
-                (u'wally', Engineer, u'wally', Engineer)
+                ('dilbert', Engineer, 'dilbert', Engineer),
+                ('dogbert', Manager, 'pointy haired boss', Boss),
+                ('vlad', Engineer, 'vlad', Engineer),
+                ('wally', Engineer, 'wally', Engineer)
             ]
         )
 
@@ -91,10 +91,10 @@ class _WithPolymorphicBase(_PolymorphicFixtureBase):
                     )
                 ).order_by(pa.name, pa_alias.name)],
             [
-                (u'dilbert', u'java', u'dilbert', u'java'),
-                (u'dogbert', None, u'pointy haired boss', None),
-                (u'vlad', u'cobol', u'vlad', u'cobol'),
-                (u'wally', u'c++', u'wally', u'c++')
+                ('dilbert', 'java', 'dilbert', 'java'),
+                ('dogbert', None, 'pointy haired boss', None),
+                ('vlad', 'cobol', 'vlad', 'cobol'),
+                ('wally', 'c++', 'wally', 'c++')
             ]
         )