- the raw 2to3 run

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

6 files changed, 108 insertions, 108 deletions

diff --git a/test/aaa_profiling/test_compiler.py b/test/aaa_profiling/test_compiler.py
index 1b7798d06..8304296da 100644
--- a/test/aaa_profiling/test_compiler.py
+++ b/test/aaa_profiling/test_compiler.py
@@ -29,7 +29,7 @@ class CompileTest(fixtures.TestBase, AssertsExecutionResults):
             for c in t.c:
                 c.type._type_affinity
         from sqlalchemy import types
-        for t in types._type_map.values():
+        for t in list(types._type_map.values()):
             t._type_affinity
 
         cls.dialect = default.DefaultDialect()
diff --git a/test/aaa_profiling/test_memusage.py b/test/aaa_profiling/test_memusage.py
index 57bddc859..20c6f0a65 100644
--- a/test/aaa_profiling/test_memusage.py
+++ b/test/aaa_profiling/test_memusage.py
@@ -47,7 +47,7 @@ def profile_memory(times=50):
                 gc_collect()
                 samples[x] = len(get_objects_skipping_sqlite_issue())
 
-            print "sample gc sizes:", samples
+            print("sample gc sizes:", samples)
 
             assert len(_sessions) == 0
 
diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py
index b9eeb8361..199b96e5f 100644
--- a/test/aaa_profiling/test_orm.py
+++ b/test/aaa_profiling/test_orm.py
@@ -144,7 +144,7 @@ class LoadManyToOneFromIdentityTest(fixtures.MappedTest):
 
         child.insert().execute([
             {'id':i, 'data':'c%d' % i}
-            for i in xrange(1, 251)
+            for i in range(1, 251)
         ])
         parent.insert().execute([
             {
@@ -152,7 +152,7 @@ class LoadManyToOneFromIdentityTest(fixtures.MappedTest):
                 'data':'p%dc%d' % (i, (i % 250) + 1),
                 'child_id':(i % 250) + 1
             }
-            for i in xrange(1, 1000)
+            for i in range(1, 1000)
         ])
 
     def test_many_to_one_load_no_identity(self):
@@ -234,11 +234,11 @@ class MergeBackrefsTest(fixtures.MappedTest):
         s = Session()
         s.add_all([
             A(id=i,
-                bs=[B(id=(i * 5) + j) for j in xrange(1, 5)],
+                bs=[B(id=(i * 5) + j) for j in range(1, 5)],
                 c=C(id=i),
-                ds=[D(id=(i * 5) + j) for j in xrange(1, 5)]
+                ds=[D(id=(i * 5) + j) for j in range(1, 5)]
             )
-            for i in xrange(1, 5)
+            for i in range(1, 5)
         ])
         s.commit()
 
@@ -249,11 +249,11 @@ class MergeBackrefsTest(fixtures.MappedTest):
         s = Session()
         for a in [
             A(id=i,
-                bs=[B(id=(i * 5) + j) for j in xrange(1, 5)],
+                bs=[B(id=(i * 5) + j) for j in range(1, 5)],
                 c=C(id=i),
-                ds=[D(id=(i * 5) + j) for j in xrange(1, 5)]
+                ds=[D(id=(i * 5) + j) for j in range(1, 5)]
             )
-            for i in xrange(1, 5)
+            for i in range(1, 5)
         ]:
             s.merge(a)
 
diff --git a/test/aaa_profiling/test_resultset.py b/test/aaa_profiling/test_resultset.py
index 0146d1b08..95a1fa3ae 100644
--- a/test/aaa_profiling/test_resultset.py
+++ b/test/aaa_profiling/test_resultset.py
@@ -19,10 +19,10 @@ class ResultSetTest(fixtures.TestBase, AssertsExecutionResults):
 
     def setup(self):
         metadata.create_all()
-        t.insert().execute([dict(('field%d' % fnum, u'value%d' % fnum)
+        t.insert().execute([dict(('field%d' % fnum, 'value%d' % fnum)
                            for fnum in range(NUM_FIELDS)) for r_num in
                            range(NUM_RECORDS)])
-        t2.insert().execute([dict(('field%d' % fnum, u'value%d' % fnum)
+        t2.insert().execute([dict(('field%d' % fnum, 'value%d' % fnum)
                             for fnum in range(NUM_FIELDS)) for r_num in
                             range(NUM_RECORDS)])
 
@@ -88,7 +88,7 @@ class RowProxyTest(fixtures.TestBase):
 
         keymap = {}
         for index, (keyobjs, processor, values) in \
-            enumerate(zip(keys, processors, row)):
+            enumerate(list(zip(keys, processors, row))):
             for key in keyobjs:
                 keymap[key] = (processor, key, index)
             keymap[index] = (processor, key, index)
diff --git a/test/aaa_profiling/test_zoomark.py b/test/aaa_profiling/test_zoomark.py
index 5fc9ffc2a..79417e2dc 100644
--- a/test/aaa_profiling/test_zoomark.py
+++ b/test/aaa_profiling/test_zoomark.py
@@ -72,68 +72,68 @@ class ZooMarkTest(fixtures.TestBase):
         Zoo = metadata.tables['Zoo']
         Animal = metadata.tables['Animal']
         engine = metadata.bind
-        wap = engine.execute(Zoo.insert(), Name=u'Wild Animal Park',
+        wap = engine.execute(Zoo.insert(), Name='Wild Animal Park',
                                    Founded=datetime.date(2000, 1, 1),
                                    Opens=datetime.time(8, 15, 59),
                                    LastEscape=
                                   datetime.datetime(2004, 7, 29, 5, 6, 7),
                                   Admission=4.95).inserted_primary_key[0]
-        sdz = engine.execute(Zoo.insert(), Name=u'San Diego Zoo',
+        sdz = engine.execute(Zoo.insert(), Name='San Diego Zoo',
                                    Founded=datetime.date(1935, 9, 13),
                                    Opens=datetime.time(9, 0, 0),
                                    Admission=0).inserted_primary_key[0]
-        engine.execute(Zoo.insert(inline=True), Name=u'Montr\xe9al Biod\xf4me',
+        engine.execute(Zoo.insert(inline=True), Name='Montr\xe9al Biod\xf4me',
                 Founded=datetime.date(1992, 6, 19),
                 Opens=datetime.time(9, 0, 0), Admission=11.75)
-        seaworld = engine.execute(Zoo.insert(), Name=u'Sea_World',
+        seaworld = engine.execute(Zoo.insert(), Name='Sea_World',
                 Admission=60).inserted_primary_key[0]
 
         # Let's add a crazy futuristic Zoo to test large date values.
 
-        lp = engine.execute(Zoo.insert(), Name=u'Luna Park',
+        lp = engine.execute(Zoo.insert(), Name='Luna Park',
                                   Founded=datetime.date(2072, 7, 17),
                                   Opens=datetime.time(0, 0, 0),
                                   Admission=134.95).inserted_primary_key[0]
 
         # Animals
 
-        leopardid = engine.execute(Animal.insert(), Species=u'Leopard',
+        leopardid = engine.execute(Animal.insert(), Species='Leopard',
                 Lifespan=73.5).inserted_primary_key[0]
         engine.execute(Animal.update(Animal.c.ID == leopardid), ZooID=wap,
                 LastEscape=datetime.datetime( 2004, 12, 21, 8, 15, 0, 999907,)
                 )
-        lion = engine.execute(Animal.insert(), Species=u'Lion',
+        lion = engine.execute(Animal.insert(), Species='Lion',
                 ZooID=wap).inserted_primary_key[0]
-        engine.execute(Animal.insert(), Species=u'Slug', Legs=1, Lifespan=.75)
-        tiger = engine.execute(Animal.insert(), Species=u'Tiger',
+        engine.execute(Animal.insert(), Species='Slug', Legs=1, Lifespan=.75)
+        tiger = engine.execute(Animal.insert(), Species='Tiger',
                 ZooID=sdz).inserted_primary_key[0]
 
         # Override Legs.default with itself just to make sure it works.
 
-        engine.execute(Animal.insert(inline=True), Species=u'Bear', Legs=4)
-        engine.execute(Animal.insert(inline=True), Species=u'Ostrich', Legs=2,
+        engine.execute(Animal.insert(inline=True), Species='Bear', Legs=4)
+        engine.execute(Animal.insert(inline=True), Species='Ostrich', Legs=2,
                 Lifespan=103.2)
-        engine.execute(Animal.insert(inline=True), Species=u'Centipede',
+        engine.execute(Animal.insert(inline=True), Species='Centipede',
                 Legs=100)
-        emp = engine.execute(Animal.insert(), Species=u'Emperor Penguin',
+        emp = engine.execute(Animal.insert(), Species='Emperor Penguin',
                 Legs=2, ZooID=seaworld).inserted_primary_key[0]
-        adelie = engine.execute(Animal.insert(), Species=u'Adelie Penguin',
+        adelie = engine.execute(Animal.insert(), Species='Adelie Penguin',
                 Legs=2, ZooID=seaworld).inserted_primary_key[0]
-        engine.execute(Animal.insert(inline=True), Species=u'Millipede',
+        engine.execute(Animal.insert(inline=True), Species='Millipede',
                 Legs=1000000, ZooID=sdz)
 
         # Add a mother and child to test relationships
 
-        bai_yun = engine.execute(Animal.insert(), Species=u'Ape',
-                Name=u'Bai Yun', Legs=2).inserted_primary_key[0]
-        engine.execute(Animal.insert(inline=True), Species=u'Ape',
-                Name=u'Hua Mei', Legs=2, MotherID=bai_yun)
+        bai_yun = engine.execute(Animal.insert(), Species='Ape',
+                Name='Bai Yun', Legs=2).inserted_primary_key[0]
+        engine.execute(Animal.insert(inline=True), Species='Ape',
+                Name='Hua Mei', Legs=2, MotherID=bai_yun)
 
     def test_baseline_2_insert(self):
         Animal = metadata.tables['Animal']
         i = Animal.insert(inline=True)
-        for x in xrange(ITERATIONS):
-            tick = i.execute(Species=u'Tick', Name=u'Tick %d' % x,
+        for x in range(ITERATIONS):
+            tick = i.execute(Species='Tick', Name='Tick %d' % x,
                              Legs=8)
 
     def test_baseline_3_properties(self):
@@ -146,28 +146,28 @@ class ZooMarkTest(fixtures.TestBase):
 
             return list(engine.execute(select).first())
 
-        for x in xrange(ITERATIONS):
+        for x in range(ITERATIONS):
 
             # Zoos
 
             WAP = fullobject(Zoo.select(Zoo.c.Name
-                             == u'Wild Animal Park'))
+                             == 'Wild Animal Park'))
             SDZ = fullobject(Zoo.select(Zoo.c.Founded
                              == datetime.date(1935, 9, 13)))
             Biodome = fullobject(Zoo.select(Zoo.c.Name
-                                 == u'Montr\xe9al Biod\xf4me'))
+                                 == 'Montr\xe9al Biod\xf4me'))
             seaworld = fullobject(Zoo.select(Zoo.c.Admission
                                   == float(60)))
 
             # Animals
 
             leopard = fullobject(Animal.select(Animal.c.Species
-                                 == u'Leopard'))
+                                 == 'Leopard'))
             ostrich = fullobject(Animal.select(Animal.c.Species
-                                 == u'Ostrich'))
+                                 == 'Ostrich'))
             millipede = fullobject(Animal.select(Animal.c.Legs
                                    == 1000000))
-            ticks = fullobject(Animal.select(Animal.c.Species == u'Tick'
+            ticks = fullobject(Animal.select(Animal.c.Species == 'Tick'
                                ))
 
     def test_baseline_4_expressions(self):
@@ -180,7 +180,7 @@ class ZooMarkTest(fixtures.TestBase):
 
             return [list(row) for row in engine.execute(select).fetchall()]
 
-        for x in xrange(ITERATIONS):
+        for x in range(ITERATIONS):
             assert len(fulltable(Zoo.select())) == 5
             assert len(fulltable(Animal.select())) == ITERATIONS + 12
             assert len(fulltable(Animal.select(Animal.c.Legs == 4))) \
@@ -194,9 +194,9 @@ class ZooMarkTest(fixtures.TestBase):
             assert len(fulltable(Animal.select(Animal.c.Lifespan
                        > 70))) == 2
             assert len(fulltable(Animal.select(Animal.c.Species.
-                        startswith(u'L')))) == 2
+                        startswith('L')))) == 2
             assert len(fulltable(Animal.select(Animal.c.Species.
-                        endswith(u'pede')))) == 2
+                        endswith('pede')))) == 2
             assert len(fulltable(Animal.select(Animal.c.LastEscape
                        != None))) == 1
             assert len(fulltable(Animal.select(None
@@ -204,10 +204,10 @@ class ZooMarkTest(fixtures.TestBase):
 
             # In operator (containedby)
 
-            assert len(fulltable(Animal.select(Animal.c.Species.like(u'%pede%'
+            assert len(fulltable(Animal.select(Animal.c.Species.like('%pede%'
                        )))) == 2
-            assert len(fulltable(Animal.select(Animal.c.Species.in_([u'Lion'
-                       , u'Tiger', u'Bear'])))) == 3
+            assert len(fulltable(Animal.select(Animal.c.Species.in_(['Lion'
+                       , 'Tiger', 'Bear'])))) == 3
 
             # Try In with cell references
             class thing(object):
@@ -215,20 +215,20 @@ class ZooMarkTest(fixtures.TestBase):
 
 
             pet, pet2 = thing(), thing()
-            pet.Name, pet2.Name = u'Slug', u'Ostrich'
+            pet.Name, pet2.Name = 'Slug', 'Ostrich'
             assert len(fulltable(Animal.select(Animal.c.Species.in_([pet.Name,
                        pet2.Name])))) == 2
 
             # logic and other functions
 
-            assert len(fulltable(Animal.select(Animal.c.Species.like(u'Slug'
+            assert len(fulltable(Animal.select(Animal.c.Species.like('Slug'
                        )))) == 1
-            assert len(fulltable(Animal.select(Animal.c.Species.like(u'%pede%'
+            assert len(fulltable(Animal.select(Animal.c.Species.like('%pede%'
                        )))) == 2
-            name = u'Lion'
+            name = 'Lion'
             assert len(fulltable(Animal.select(func.length(Animal.c.Species)
                        == len(name)))) == ITERATIONS + 3
-            assert len(fulltable(Animal.select(Animal.c.Species.like(u'%i%'
+            assert len(fulltable(Animal.select(Animal.c.Species.like('%i%'
                        )))) == ITERATIONS + 7
 
             # Test now(), today(), year(), month(), day()
@@ -250,7 +250,7 @@ class ZooMarkTest(fixtures.TestBase):
         Zoo = metadata.tables['Zoo']
         engine = metadata.bind
 
-        for x in xrange(ITERATIONS):
+        for x in range(ITERATIONS):
 
             # views
 
@@ -274,7 +274,7 @@ class ZooMarkTest(fixtures.TestBase):
             for species, lifespan in engine.execute(select([Animal.c.Species,
                     Animal.c.Lifespan])).fetchall():
                 assert lifespan == expected[species]
-            expected = [u'Montr\xe9al Biod\xf4me', 'Wild Animal Park']
+            expected = ['Montr\xe9al Biod\xf4me', 'Wild Animal Park']
             e = select([Zoo.c.Name], and_(Zoo.c.Founded != None,
                        Zoo.c.Founded <= func.current_timestamp(),
                        Zoo.c.Founded >= datetime.date(1990, 1, 1)))
@@ -290,21 +290,21 @@ class ZooMarkTest(fixtures.TestBase):
     def test_baseline_6_editing(self):
         Zoo = metadata.tables['Zoo']
         engine = metadata.bind
-        for x in xrange(ITERATIONS):
+        for x in range(ITERATIONS):
 
             # Edit
 
-            SDZ = engine.execute(Zoo.select(Zoo.c.Name == u'San Diego Zoo'
+            SDZ = engine.execute(Zoo.select(Zoo.c.Name == 'San Diego Zoo'
                              )).first()
             engine.execute(Zoo.update(Zoo.c.ID == SDZ['ID'
-                       ]), Name=u'The San Diego Zoo',
+                       ]), Name='The San Diego Zoo',
                                   Founded=datetime.date(1900, 1, 1),
                                   Opens=datetime.time(7, 30, 0),
                                   Admission='35.00')
 
             # Test edits
 
-            SDZ = engine.execute(Zoo.select(Zoo.c.Name == u'The San Diego Zoo'
+            SDZ = engine.execute(Zoo.select(Zoo.c.Name == 'The San Diego Zoo'
                              )).first()
             assert SDZ['Founded'] == datetime.date(1900, 1, 1), \
                 SDZ['Founded']
@@ -312,14 +312,14 @@ class ZooMarkTest(fixtures.TestBase):
             # Change it back
 
             engine.execute(Zoo.update(Zoo.c.ID == SDZ['ID'
-                       ]), Name=u'San Diego Zoo',
+                       ]), Name='San Diego Zoo',
                                   Founded=datetime.date(1935, 9, 13),
                                   Opens=datetime.time(9, 0, 0),
                                   Admission='0')
 
             # Test re-edits
 
-            SDZ = engine.execute(Zoo.select(Zoo.c.Name == u'San Diego Zoo'
+            SDZ = engine.execute(Zoo.select(Zoo.c.Name == 'San Diego Zoo'
                              )).first()
             assert SDZ['Founded'] == datetime.date(1935, 9, 13)
 
@@ -333,14 +333,14 @@ class ZooMarkTest(fixtures.TestBase):
 
             return [list(row) for row in engine.execute(select).fetchall()]
 
-        for x in xrange(ITERATIONS):
+        for x in range(ITERATIONS):
             za = fulltable(select([Zoo.c.ID] + list(Animal.c),
-                           Zoo.c.Name == u'San Diego Zoo',
+                           Zoo.c.Name == 'San Diego Zoo',
                            from_obj=[join(Zoo, Animal)]))
-            SDZ = Zoo.select(Zoo.c.Name == u'San Diego Zoo')
+            SDZ = Zoo.select(Zoo.c.Name == 'San Diego Zoo')
             e = fulltable(select([Zoo.c.ID, Animal.c.ID],
-                          and_(Zoo.c.Name == u'San Diego Zoo',
-                          Animal.c.Species == u'Leopard'),
+                          and_(Zoo.c.Name == 'San Diego Zoo',
+                          Animal.c.Species == 'Leopard'),
                           from_obj=[join(Zoo, Animal)]))
 
             # Now try the same query with INNER, LEFT, and RIGHT JOINs.
diff --git a/test/aaa_profiling/test_zoomark_orm.py b/test/aaa_profiling/test_zoomark_orm.py
index f8c5477f7..40fb8b03b 100644
--- a/test/aaa_profiling/test_zoomark_orm.py
+++ b/test/aaa_profiling/test_zoomark_orm.py
@@ -75,14 +75,14 @@ class ZooMarkTest(fixtures.TestBase):
         class Zoo(object):
 
             def __init__(self, **kwargs):
-                for k, v in kwargs.iteritems():
+                for k, v in kwargs.items():
                     setattr(self, k, v)
 
 
         class Animal(object):
 
             def __init__(self, **kwargs):
-                for k, v in kwargs.iteritems():
+                for k, v in kwargs.items():
                     setattr(self, k, v)
 
 
@@ -90,93 +90,93 @@ class ZooMarkTest(fixtures.TestBase):
         mapper(Animal, animal)
 
     def test_baseline_1a_populate(self):
-        wap = Zoo(Name=u'Wild Animal Park', Founded=datetime.date(2000,
+        wap = Zoo(Name='Wild Animal Park', Founded=datetime.date(2000,
                   1, 1), Opens=datetime.time(8, 15, 59),
                   LastEscape=datetime.datetime( 2004, 7, 29, 5, 6, 7, ),
                   Admission=4.95)
         session.add(wap)
-        sdz = Zoo(Name=u'San Diego Zoo', Founded=datetime.date(1835, 9,
+        sdz = Zoo(Name='San Diego Zoo', Founded=datetime.date(1835, 9,
                   13), Opens=datetime.time(9, 0, 0), Admission=0)
         session.add(sdz)
-        bio = Zoo(Name=u'Montr\xe9al Biod\xf4me',
+        bio = Zoo(Name='Montr\xe9al Biod\xf4me',
                   Founded=datetime.date(1992, 6, 19),
                   Opens=datetime.time(9, 0, 0), Admission=11.75)
         session.add(bio)
-        seaworld = Zoo(Name=u'Sea_World', Admission=60)
+        seaworld = Zoo(Name='Sea_World', Admission=60)
         session.add(seaworld)
 
         # Let's add a crazy futuristic Zoo to test large date values.
 
-        lp = Zoo(Name=u'Luna Park', Founded=datetime.date(2072, 7, 17),
+        lp = Zoo(Name='Luna Park', Founded=datetime.date(2072, 7, 17),
                  Opens=datetime.time(0, 0, 0), Admission=134.95)
         session.add(lp)
         session.flush()
 
         # Animals
 
-        leopard = Animal(Species=u'Leopard', Lifespan=73.5)
+        leopard = Animal(Species='Leopard', Lifespan=73.5)
         session.add(leopard)
         leopard.ZooID = wap.ID
         leopard.LastEscape = \
                 datetime.datetime(2004, 12, 21, 8, 15, 0, 999907, )
-        session.add(Animal(Species=u'Lion', ZooID=wap.ID))
-        session.add(Animal(Species=u'Slug', Legs=1, Lifespan=.75))
-        session.add(Animal(Species=u'Tiger', ZooID=sdz.ID))
+        session.add(Animal(Species='Lion', ZooID=wap.ID))
+        session.add(Animal(Species='Slug', Legs=1, Lifespan=.75))
+        session.add(Animal(Species='Tiger', ZooID=sdz.ID))
 
         # Override Legs.default with itself just to make sure it works.
 
-        session.add(Animal(Species=u'Bear', Legs=4))
-        session.add(Animal(Species=u'Ostrich', Legs=2, Lifespan=103.2))
-        session.add(Animal(Species=u'Centipede', Legs=100))
-        session.add(Animal(Species=u'Emperor Penguin', Legs=2,
+        session.add(Animal(Species='Bear', Legs=4))
+        session.add(Animal(Species='Ostrich', Legs=2, Lifespan=103.2))
+        session.add(Animal(Species='Centipede', Legs=100))
+        session.add(Animal(Species='Emperor Penguin', Legs=2,
                     ZooID=seaworld.ID))
-        session.add(Animal(Species=u'Adelie Penguin', Legs=2,
+        session.add(Animal(Species='Adelie Penguin', Legs=2,
                     ZooID=seaworld.ID))
-        session.add(Animal(Species=u'Millipede', Legs=1000000,
+        session.add(Animal(Species='Millipede', Legs=1000000,
                     ZooID=sdz.ID))
 
         # Add a mother and child to test relationships
 
-        bai_yun = Animal(Species=u'Ape', Nameu=u'Bai Yun', Legs=2)
+        bai_yun = Animal(Species='Ape', Nameu='Bai Yun', Legs=2)
         session.add(bai_yun)
-        session.add(Animal(Species=u'Ape', Name=u'Hua Mei', Legs=2,
+        session.add(Animal(Species='Ape', Name='Hua Mei', Legs=2,
                     MotherID=bai_yun.ID))
         session.flush()
         session.commit()
 
     def test_baseline_2_insert(self):
-        for x in xrange(ITERATIONS):
-            session.add(Animal(Species=u'Tick', Name=u'Tick %d' % x,
+        for x in range(ITERATIONS):
+            session.add(Animal(Species='Tick', Name='Tick %d' % x,
                         Legs=8))
         session.flush()
 
     def test_baseline_3_properties(self):
-        for x in xrange(ITERATIONS):
+        for x in range(ITERATIONS):
 
             # Zoos
 
             WAP = list(session.query(Zoo).filter(Zoo.Name
-                       == u'Wild Animal Park'))
+                       == 'Wild Animal Park'))
             SDZ = list(session.query(Zoo).filter(Zoo.Founded
                        == datetime.date(1835, 9, 13)))
             Biodome = list(session.query(Zoo).filter(Zoo.Name
-                           == u'Montr\xe9al Biod\xf4me'))
+                           == 'Montr\xe9al Biod\xf4me'))
             seaworld = list(session.query(Zoo).filter(Zoo.Admission
                             == float(60)))
 
             # Animals
 
             leopard = list(session.query(Animal).filter(Animal.Species
-                           == u'Leopard'))
+                           == 'Leopard'))
             ostrich = list(session.query(Animal).filter(Animal.Species
-                           == u'Ostrich'))
+                           == 'Ostrich'))
             millipede = list(session.query(Animal).filter(Animal.Legs
                              == 1000000))
             ticks = list(session.query(Animal).filter(Animal.Species
-                         == u'Tick'))
+                         == 'Tick'))
 
     def test_baseline_4_expressions(self):
-        for x in xrange(ITERATIONS):
+        for x in range(ITERATIONS):
             assert len(list(session.query(Zoo))) == 5
             assert len(list(session.query(Animal))) == ITERATIONS + 12
             assert len(list(session.query(Animal).filter(Animal.Legs
@@ -190,9 +190,9 @@ class ZooMarkTest(fixtures.TestBase):
             assert len(list(session.query(Animal).filter(Animal.Lifespan
                        > 70))) == 2
             assert len(list(session.query(Animal).
-                        filter(Animal.Species.like(u'L%')))) == 2
+                        filter(Animal.Species.like('L%')))) == 2
             assert len(list(session.query(Animal).
-                        filter(Animal.Species.like(u'%pede')))) == 2
+                        filter(Animal.Species.like('%pede')))) == 2
             assert len(list(session.query(Animal).filter(Animal.LastEscape
                        != None))) == 1
             assert len(list(session.query(Animal).filter(Animal.LastEscape
@@ -201,29 +201,29 @@ class ZooMarkTest(fixtures.TestBase):
             # In operator (containedby)
 
             assert len(list(session.query(Animal).filter(
-                    Animal.Species.like(u'%pede%')))) == 2
+                    Animal.Species.like('%pede%')))) == 2
             assert len(list(session.query(Animal).
-                    filter(Animal.Species.in_((u'Lion'
-                       , u'Tiger', u'Bear'))))) == 3
+                    filter(Animal.Species.in_(('Lion'
+                       , 'Tiger', 'Bear'))))) == 3
 
             # Try In with cell references
             class thing(object):
                 pass
 
             pet, pet2 = thing(), thing()
-            pet.Name, pet2.Name = u'Slug', u'Ostrich'
+            pet.Name, pet2.Name = 'Slug', 'Ostrich'
             assert len(list(session.query(Animal).
                     filter(Animal.Species.in_((pet.Name,
                        pet2.Name))))) == 2
 
             # logic and other functions
 
-            name = u'Lion'
+            name = 'Lion'
             assert len(list(session.query(Animal).
                     filter(func.length(Animal.Species)
                        == len(name)))) == ITERATIONS + 3
             assert len(list(session.query(Animal).
-                    filter(Animal.Species.like(u'%i%'
+                    filter(Animal.Species.like('%i%'
                        )))) == ITERATIONS + 7
 
             # Test now(), today(), year(), month(), day()
@@ -246,7 +246,7 @@ class ZooMarkTest(fixtures.TestBase):
 
         # TODO: convert to ORM
         engine = metadata.bind
-        for x in xrange(ITERATIONS):
+        for x in range(ITERATIONS):
 
             # views
 
@@ -270,7 +270,7 @@ class ZooMarkTest(fixtures.TestBase):
             for species, lifespan in engine.execute(select([Animal.c.Species,
                     Animal.c.Lifespan])).fetchall():
                 assert lifespan == expected[species]
-            expected = [u'Montr\xe9al Biod\xf4me', 'Wild Animal Park']
+            expected = ['Montr\xe9al Biod\xf4me', 'Wild Animal Park']
             e = select([Zoo.c.Name], and_(Zoo.c.Founded != None,
                        Zoo.c.Founded <= func.current_timestamp(),
                        Zoo.c.Founded >= datetime.date(1990, 1, 1)))
@@ -284,13 +284,13 @@ class ZooMarkTest(fixtures.TestBase):
             legs.sort()
 
     def test_baseline_6_editing(self):
-        for x in xrange(ITERATIONS):
+        for x in range(ITERATIONS):
 
             # Edit
 
-            SDZ = session.query(Zoo).filter(Zoo.Name == u'San Diego Zoo'
+            SDZ = session.query(Zoo).filter(Zoo.Name == 'San Diego Zoo'
                     ).one()
-            SDZ.Name = u'The San Diego Zoo'
+            SDZ.Name = 'The San Diego Zoo'
             SDZ.Founded = datetime.date(1900, 1, 1)
             SDZ.Opens = datetime.time(7, 30, 0)
             SDZ.Admission = 35.00
@@ -298,19 +298,19 @@ class ZooMarkTest(fixtures.TestBase):
             # Test edits
 
             SDZ = session.query(Zoo).filter(Zoo.Name
-                    == u'The San Diego Zoo').one()
+                    == 'The San Diego Zoo').one()
             assert SDZ.Founded == datetime.date(1900, 1, 1), SDZ.Founded
 
             # Change it back
 
-            SDZ.Name = u'San Diego Zoo'
+            SDZ.Name = 'San Diego Zoo'
             SDZ.Founded = datetime.date(1835, 9, 13)
             SDZ.Opens = datetime.time(9, 0, 0)
             SDZ.Admission = 0
 
             # Test re-edits
 
-            SDZ = session.query(Zoo).filter(Zoo.Name == u'San Diego Zoo'
+            SDZ = session.query(Zoo).filter(Zoo.Name == 'San Diego Zoo'
                     ).one()
             assert SDZ.Founded == datetime.date(1835, 9, 13), \
                 SDZ.Founded