merge default

4 files changed, 257 insertions, 227 deletions

diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py
index 86df92987..a2f6b3796 100644
--- a/test/engine/test_reflection.py
+++ b/test/engine/test_reflection.py
@@ -1,10 +1,7 @@
 import unicodedata
 import sqlalchemy as sa
-from sqlalchemy import exc as sa_exc
-from sqlalchemy import types as sql_types
 from sqlalchemy import schema, events, event, inspect
 from sqlalchemy import MetaData, Integer, String
-from sqlalchemy.engine.reflection import Inspector
 from sqlalchemy.testing import ComparesTables, \
                             engines, AssertsCompiledSQL, fixtures
 from sqlalchemy.testing.schema import Table, Column
@@ -29,7 +26,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
             Column('test1', sa.CHAR(5), nullable=False),
             Column('test2', sa.Float(5), nullable=False),
             Column('test3', sa.Text),
-            Column('test4', sa.Numeric(10, 2), nullable = False),
+            Column('test4', sa.Numeric(10, 2), nullable=False),
             Column('test5', sa.Date),
             Column('parent_user_id', sa.Integer,
                    sa.ForeignKey('engine_users.user_id')),
@@ -123,7 +120,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
     def test_extend_existing(self):
         meta = self.metadata
 
-        t1 = Table('t', meta,
+        Table('t', meta,
             Column('id', Integer, primary_key=True),
             Column('x', Integer),
             Column('y', Integer),
@@ -209,8 +206,8 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         establishes the FK not present in the DB.
 
         """
-        a = Table('a', self.metadata, Column('id', Integer, primary_key=True))
-        b = Table('b', self.metadata, Column('id', Integer, primary_key=True),
+        Table('a', self.metadata, Column('id', Integer, primary_key=True))
+        Table('b', self.metadata, Column('id', Integer, primary_key=True),
                                     Column('a_id', Integer))
         self.metadata.create_all()
 
@@ -232,8 +229,8 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         the in-python one only.
 
         """
-        a = Table('a', self.metadata, Column('id', Integer, primary_key=True))
-        b = Table('b', self.metadata, Column('id', Integer, primary_key=True),
+        Table('a', self.metadata, Column('id', Integer, primary_key=True))
+        Table('b', self.metadata, Column('id', Integer, primary_key=True),
                                     Column('a_id', Integer, sa.ForeignKey('a.id')))
         self.metadata.create_all()
 
@@ -254,8 +251,8 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         DB means the FK is skipped and doesn't get installed at all.
 
         """
-        a = Table('a', self.metadata, Column('id', Integer, primary_key=True))
-        b = Table('b', self.metadata, Column('id', Integer, primary_key=True),
+        Table('a', self.metadata, Column('id', Integer, primary_key=True))
+        Table('b', self.metadata, Column('id', Integer, primary_key=True),
                                     Column('a_id', Integer, sa.ForeignKey('a.id')))
         self.metadata.create_all()
 
@@ -272,7 +269,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
     @testing.provide_metadata
     def test_autoload_replace_primary_key(self):
-        a = Table('a', self.metadata, Column('id', Integer))
+        Table('a', self.metadata, Column('id', Integer))
         self.metadata.create_all()
 
         m2 = MetaData()
@@ -296,12 +293,12 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         """
 
         meta = self.metadata
-        t1 = Table('test', meta,
+        Table('test', meta,
             Column('id', sa.Integer, primary_key=True),
             Column('data', sa.String(50)),
             mysql_engine='MyISAM'
         )
-        t2 = Table('test2', meta,
+        Table('test2', meta,
             Column('id', sa.Integer, sa.ForeignKey('test.id'),
                                         primary_key=True),
             Column('id2', sa.Integer, primary_key=True),
@@ -366,10 +363,10 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         a primary key column"""
 
         meta = self.metadata
-        users = Table('users', meta,
+        Table('users', meta,
             Column('id', sa.Integer, primary_key=True),
             Column('name', sa.String(30)))
-        addresses = Table('addresses', meta,
+        Table('addresses', meta,
             Column('id', sa.Integer, primary_key=True),
             Column('street', sa.String(30)))
 
@@ -384,7 +381,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         assert list(a2.primary_key) == [a2.c.id]
         assert list(u2.primary_key) == [u2.c.id]
-        assert u2.join(a2).onclause.compare(u2.c.id==a2.c.id)
+        assert u2.join(a2).onclause.compare(u2.c.id == a2.c.id)
 
         meta3 = MetaData(testing.db)
         u3 = Table('users', meta3, autoload=True)
@@ -395,7 +392,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         assert list(a3.primary_key) == [a3.c.id]
         assert list(u3.primary_key) == [u3.c.id]
-        assert u3.join(a3).onclause.compare(u3.c.id==a3.c.id)
+        assert u3.join(a3).onclause.compare(u3.c.id == a3.c.id)
 
     @testing.provide_metadata
     def test_override_nonexistent_fk(self):
@@ -404,10 +401,10 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         is common with MySQL MyISAM tables."""
 
         meta = self.metadata
-        users = Table('users', meta,
+        Table('users', meta,
             Column('id', sa.Integer, primary_key=True),
             Column('name', sa.String(30)))
-        addresses = Table('addresses', meta,
+        Table('addresses', meta,
             Column('id', sa.Integer, primary_key=True),
             Column('street', sa.String(30)),
             Column('user_id', sa.Integer))
@@ -415,7 +412,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         meta.create_all()
         meta2 = MetaData(testing.db)
         a2 = Table('addresses', meta2,
-                Column('user_id',sa.Integer, sa.ForeignKey('users.id')),
+                Column('user_id', sa.Integer, sa.ForeignKey('users.id')),
                autoload=True)
         u2 = Table('users', meta2, autoload=True)
         assert len(a2.c.user_id.foreign_keys) == 1
@@ -464,13 +461,13 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         metadata = self.metadata
 
-        a = Table('a',
+        Table('a',
             metadata,
             Column('x', sa.Integer, primary_key=True),
             Column('y', sa.Integer, primary_key=True),
         )
 
-        b = Table('b',
+        Table('b',
             metadata,
             Column('x', sa.Integer, primary_key=True),
             Column('y', sa.Integer, primary_key=True),
@@ -503,12 +500,12 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         and that ForeignKey targeting during reflection still works."""
 
         meta = self.metadata
-        a1 = Table('a', meta,
+        Table('a', meta,
             Column('x', sa.Integer, primary_key=True),
             Column('z', sa.Integer),
             test_needs_fk=True
         )
-        b1 = Table('b', meta,
+        Table('b', meta,
             Column('y', sa.Integer, sa.ForeignKey('a.x')),
             test_needs_fk=True
         )
@@ -530,12 +527,12 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         """
 
         meta = self.metadata
-        a1 = Table('a', meta,
+        Table('a', meta,
             Column('x', sa.Integer, primary_key=True),
             Column('z', sa.Integer),
             test_needs_fk=True
         )
-        b1 = Table('b', meta,
+        Table('b', meta,
             Column('y', sa.Integer, sa.ForeignKey('a.x')),
             test_needs_fk=True
         )
@@ -554,11 +551,11 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         have that foreign key, and that the FK is not duped. """
 
         meta = self.metadata
-        users = Table('users', meta,
+        Table('users', meta,
             Column('id', sa.Integer, primary_key=True),
             Column('name', sa.String(30)),
             test_needs_fk=True)
-        addresses = Table('addresses', meta,
+        Table('addresses', meta,
             Column('id', sa.Integer, primary_key=True),
             Column('user_id', sa.Integer, sa.ForeignKey('users.id')),
             test_needs_fk=True)
@@ -566,7 +563,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         meta.create_all()
         meta2 = MetaData(testing.db)
         a2 = Table('addresses', meta2,
-                Column('user_id',sa.Integer, sa.ForeignKey('users.id')),
+                Column('user_id', sa.Integer, sa.ForeignKey('users.id')),
                 autoload=True)
         u2 = Table('users', meta2, autoload=True)
         s = sa.select([a2])
@@ -625,7 +622,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
     def test_fk_error(self):
         metadata = MetaData(testing.db)
-        slots_table = Table('slots', metadata,
+        Table('slots', metadata,
             Column('slot_id', sa.Integer, primary_key=True),
             Column('pkg_id', sa.Integer, sa.ForeignKey('pkgs.pkg_id')),
             Column('slot', sa.String(128)),
@@ -730,9 +727,9 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
             check_col = 'true'
         quoter = meta.bind.dialect.identifier_preparer.quote_identifier
 
-        table_b = Table('false', meta,
+        Table('false', meta,
                     Column('create', sa.Integer, primary_key=True),
-                    Column('true', sa.Integer,sa.ForeignKey('select.not')),
+                    Column('true', sa.Integer, sa.ForeignKey('select.not')),
                     sa.CheckConstraint('%s <> 1'
                         % quoter(check_col), name='limit')
                     )
@@ -746,9 +743,9 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         meta.create_all()
         index_c.drop()
         meta2 = MetaData(testing.db)
-        table_a2 = Table('select', meta2, autoload=True)
-        table_b2 = Table('false', meta2, autoload=True)
-        table_c2 = Table('is', meta2, autoload=True)
+        Table('select', meta2, autoload=True)
+        Table('false', meta2, autoload=True)
+        Table('is', meta2, autoload=True)
 
     @testing.provide_metadata
     def _test_reflect_uses_bind(self, fn):
@@ -781,7 +778,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
     def test_reflect_all(self):
         existing = testing.db.table_names()
 
-        names = ['rt_%s' % name for name in ('a','b','c','d','e')]
+        names = ['rt_%s' % name for name in ('a', 'b', 'c', 'd', 'e')]
         nameset = set(names)
         for name in names:
             # be sure our starting environment is sane
@@ -847,9 +844,8 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         assert not c.closed
 
     def test_inspector_conn_closing(self):
-        m1 = MetaData()
         c = testing.db.connect()
-        i = inspect(testing.db)
+        inspect(c)
         assert not c.closed
 
     @testing.provide_metadata
@@ -859,8 +855,8 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
             Column('id', sa.Integer, nullable=False),
             Column('name', sa.String(20), index=True)
             )
-        i1 = sa.Index('idx1', t1.c.id, unique=True)
-        i2 = sa.Index('idx2', t1.c.name, t1.c.id, unique=False)
+        sa.Index('idx1', t1.c.id, unique=True)
+        sa.Index('idx2', t1.c.name, t1.c.id, unique=False)
         m1.create_all()
         m2 = MetaData(testing.db)
         t2 = Table('party', m2, autoload=True)
@@ -938,9 +934,9 @@ class CreateDropTest(fixtures.TestBase):
                     Column('user_id', sa.Integer,
                       sa.Sequence('user_id_seq', optional=True),
                       primary_key=True),
-                    Column('user_name',sa.String(40)))
+                    Column('user_name', sa.String(40)))
 
-        addresses = Table('email_addresses', metadata,
+        Table('email_addresses', metadata,
                       Column('address_id', sa.Integer,
                           sa.Sequence('address_id_seq', optional=True),
                           primary_key=True),
@@ -948,7 +944,7 @@ class CreateDropTest(fixtures.TestBase):
                           sa.Integer, sa.ForeignKey(users.c.user_id)),
                       Column('email_address', sa.String(40)))
 
-        orders = Table(
+        Table(
             'orders',
             metadata,
             Column('order_id', sa.Integer, sa.Sequence('order_id_seq',
@@ -958,13 +954,15 @@ class CreateDropTest(fixtures.TestBase):
             Column('description', sa.String(50)),
             Column('isopen', sa.Integer),
             )
-        orderitems = Table('items', metadata, Column('item_id', sa.INT,
+        Table('items', metadata,
+                        Column('item_id', sa.INT,
                            sa.Sequence('items_id_seq', optional=True),
-                           primary_key=True), Column('order_id',
+                               primary_key=True),
+                        Column('order_id',
                            sa.INT, sa.ForeignKey('orders')),
                            Column('item_name', sa.VARCHAR(50)))
 
-    def test_sorter( self ):
+    def test_sorter(self):
         tables = metadata.sorted_tables
         table_names = [t.name for t in tables]
         ua = [n for n in table_names if n in ('users', 'email_addresses')]
@@ -990,16 +988,16 @@ class CreateDropTest(fixtures.TestBase):
 
     def test_createdrop(self):
         metadata.create_all(bind=testing.db)
-        eq_( testing.db.has_table('items'), True )
-        eq_( testing.db.has_table('email_addresses'), True )
+        eq_(testing.db.has_table('items'), True)
+        eq_(testing.db.has_table('email_addresses'), True)
         metadata.create_all(bind=testing.db)
-        eq_( testing.db.has_table('items'), True )
+        eq_(testing.db.has_table('items'), True)
 
         metadata.drop_all(bind=testing.db)
-        eq_( testing.db.has_table('items'), False )
-        eq_( testing.db.has_table('email_addresses'), False )
+        eq_(testing.db.has_table('items'), False)
+        eq_(testing.db.has_table('email_addresses'), False)
         metadata.drop_all(bind=testing.db)
-        eq_( testing.db.has_table('items'), False )
+        eq_(testing.db.has_table('items'), False)
 
     def test_tablenames(self):
         metadata.create_all(bind=testing.db)
@@ -1022,7 +1020,7 @@ class SchemaManipulationTest(fixtures.TestBase):
                         Column('id', sa.Integer),
                         Column('user_id', sa.Integer))
 
-        fk = sa.ForeignKeyConstraint(['user_id'],[users.c.id])
+        fk = sa.ForeignKeyConstraint(['user_id'], [users.c.id])
 
         addresses.append_constraint(fk)
         addresses.append_constraint(fk)
@@ -1036,7 +1034,7 @@ class UnicodeReflectionTest(fixtures.TestBase):
         testing.db.connect().close()
 
         cls.bind = bind = engines.utf8_engine(
-                            options={'convert_unicode' : True})
+                            options={'convert_unicode': True})
 
         cls.metadata = metadata = MetaData()
 
@@ -1064,7 +1062,7 @@ class UnicodeReflectionTest(fixtures.TestBase):
             names = no_multibyte_period
         # mysql can't handle casing usually
         elif testing.against("mysql") and \
-            not testing.requires._has_mysql_fully_case_sensitive():
+                not testing.requires._has_mysql_fully_case_sensitive():
             names = no_multibyte_period.union(no_case_sensitivity)
         # mssql + pyodbc + freetds can't compare multibyte names to
         # information_schema.tables.table_name
@@ -1074,9 +1072,11 @@ class UnicodeReflectionTest(fixtures.TestBase):
             names = no_multibyte_period.union(full)
 
         for tname, cname, ixname in names:
-            t = Table(tname, metadata, Column('id', sa.Integer,
-                  sa.Sequence(cname + '_id_seq'), primary_key=True),
-                  Column(cname, Integer)
+            t = Table(tname, metadata,
+                        Column('id', sa.Integer,
+                                sa.Sequence(cname + '_id_seq'),
+                                primary_key=True),
+                        Column(cname, Integer)
                   )
             schema.Index(ixname, t.c[cname])
 
@@ -1169,11 +1169,11 @@ class SchemaTest(fixtures.TestBase):
         assert bool(schema)
 
         metadata = MetaData(engine)
-        table1 = Table('table1', metadata,
+        Table('table1', metadata,
                        Column('col1', sa.Integer, primary_key=True),
                        test_needs_fk=True,
                        schema=schema)
-        table2 = Table('table2', metadata,
+        Table('table2', metadata,
                        Column('col1', sa.Integer, primary_key=True),
                        Column('col2', sa.Integer,
                               sa.ForeignKey('%s.table1.col1' % schema)),
@@ -1185,8 +1185,8 @@ class SchemaTest(fixtures.TestBase):
             assert len(metadata.tables) == 2
             metadata.clear()
 
-            table1 = Table('table1', metadata, autoload=True, schema=schema)
-            table2 = Table('table2', metadata, autoload=True, schema=schema)
+            Table('table1', metadata, autoload=True, schema=schema)
+            Table('table2', metadata, autoload=True, schema=schema)
             assert len(metadata.tables) == 2
         finally:
             metadata.drop_all()
@@ -1209,10 +1209,10 @@ class SchemaTest(fixtures.TestBase):
         assert bool(schema)
 
         metadata = MetaData(engine, schema=schema)
-        table1 = Table('table1', metadata,
+        Table('table1', metadata,
                        Column('col1', sa.Integer, primary_key=True),
                        test_needs_fk=True)
-        table2 = Table('table2', metadata,
+        Table('table2', metadata,
                        Column('col1', sa.Integer, primary_key=True),
                        Column('col2', sa.Integer,
                               sa.ForeignKey('table1.col1')),
@@ -1223,8 +1223,8 @@ class SchemaTest(fixtures.TestBase):
             assert len(metadata.tables) == 2
             metadata.clear()
 
-            table1 = Table('table1', metadata, autoload=True)
-            table2 = Table('table2', metadata, autoload=True)
+            Table('table1', metadata, autoload=True)
+            Table('table2', metadata, autoload=True)
             assert len(metadata.tables) == 2
         finally:
             metadata.drop_all()
@@ -1261,7 +1261,7 @@ def createTables(meta, schema=None):
         Column('test1', sa.CHAR(5), nullable=False),
         Column('test2', sa.Float(5), nullable=False),
         Column('test3', sa.Text),
-        Column('test4', sa.Numeric(10, 2), nullable = False),
+        Column('test4', sa.Numeric(10, 2), nullable=False),
         Column('test5', sa.Date),
         Column('test5_1', sa.TIMESTAMP),
         Column('parent_user_id', sa.Integer,
@@ -1276,13 +1276,12 @@ def createTables(meta, schema=None):
         test_needs_fk=True,
     )
     dingalings = Table("dingalings", meta,
-              Column('dingaling_id', sa.Integer, primary_key=True),
-              Column('address_id', sa.Integer,
-                    sa.ForeignKey('%semail_addresses.address_id' % schema_prefix)),
-              Column('data', sa.String(30)),
-              schema=schema,
-              test_needs_fk=True,
-        )
+                Column('dingaling_id', sa.Integer, primary_key=True),
+                Column('address_id', sa.Integer,
+                     sa.ForeignKey('%semail_addresses.address_id' % schema_prefix)),
+                Column('data', sa.String(30)),
+                schema=schema, test_needs_fk=True,
+            )
     addresses = Table('email_addresses', meta,
         Column('address_id', sa.Integer),
         Column('remote_user_id', sa.Integer,
@@ -1437,7 +1436,7 @@ class ColumnEventsTest(fixtures.TestBase):
 
     def test_override_key(self):
         self._do_test(
-            "x", {"key":"YXZ"},
+            "x", {"key": "YXZ"},
             lambda table: eq_(table.c.YXZ.name, "x")
         )
 
@@ -1445,12 +1444,12 @@ class ColumnEventsTest(fixtures.TestBase):
         def assert_(table):
             assert isinstance(table.c.x.type, sa.String)
         self._do_test(
-            "x", {"type":sa.String},
+            "x", {"type": sa.String},
             assert_
         )
 
     def test_override_info(self):
         self._do_test(
-            "x", {"info":{"a":"b"}},
-            lambda table: eq_(table.c.x.info, {"a":"b"})
+            "x", {"info": {"a": "b"}},
+            lambda table: eq_(table.c.x.info, {"a": "b"})
         )
diff --git a/test/orm/test_instrumentation.py b/test/orm/test_instrumentation.py
index 3c564d910..1a1a70e8b 100644
--- a/test/orm/test_instrumentation.py
+++ b/test/orm/test_instrumentation.py
@@ -41,7 +41,8 @@ class InitTest(fixtures.ORMTest):
     def test_A(self):
         inits = []
 
-        class A(object): pass
+        class A(object):
+            pass
         self.register(A, inits)
 
         obj = A()
@@ -65,7 +66,8 @@ class InitTest(fixtures.ORMTest):
             def __init__(self):
                 inits.append((A, '__init__'))
 
-        class B(A): pass
+        class B(A):
+            pass
         self.register(B, inits)
 
         obj = A()
@@ -148,7 +150,8 @@ class InitTest(fixtures.ORMTest):
                 inits.append((A, '__init__'))
         self.register(A, inits)
 
-        class B(A): pass
+        class B(A):
+            pass
         self.register(B, inits)
 
         obj = A()
@@ -232,7 +235,8 @@ class InitTest(fixtures.ORMTest):
                 inits.append((A, '__init__'))
         self.register(A, inits)
 
-        class B(A): pass
+        class B(A):
+            pass
 
         class C(B):
             def __init__(self):
@@ -260,7 +264,8 @@ class InitTest(fixtures.ORMTest):
                 inits.append((A, '__init__'))
         self.register(A, inits)
 
-        class B(A): pass
+        class B(A):
+            pass
         self.register(B, inits)
 
         class C(B):
@@ -289,10 +294,12 @@ class InitTest(fixtures.ORMTest):
                 inits.append((A, '__init__'))
         self.register(A, inits)
 
-        class B(A): pass
+        class B(A):
+            pass
         self.register(B, inits)
 
-        class C(B): pass
+        class C(B):
+            pass
         self.register(C, inits)
 
         obj = A()
@@ -310,7 +317,8 @@ class InitTest(fixtures.ORMTest):
     def test_A_Bi_C(self):
         inits = []
 
-        class A(object): pass
+        class A(object):
+            pass
         self.register(A, inits)
 
         class B(A):
@@ -318,7 +326,8 @@ class InitTest(fixtures.ORMTest):
                 inits.append((B, '__init__'))
         self.register(B, inits)
 
-        class C(B): pass
+        class C(B):
+            pass
         self.register(C, inits)
 
         obj = A()
@@ -336,10 +345,12 @@ class InitTest(fixtures.ORMTest):
     def test_A_B_Ci(self):
         inits = []
 
-        class A(object): pass
+        class A(object):
+            pass
         self.register(A, inits)
 
-        class B(A): pass
+        class B(A):
+            pass
         self.register(B, inits)
 
         class C(B):
@@ -362,13 +373,16 @@ class InitTest(fixtures.ORMTest):
     def test_A_B_C(self):
         inits = []
 
-        class A(object): pass
+        class A(object):
+            pass
         self.register(A, inits)
 
-        class B(A): pass
+        class B(A):
+            pass
         self.register(B, inits)
 
-        class C(B): pass
+        class C(B):
+            pass
         self.register(C, inits)
 
         obj = A()
@@ -470,7 +484,8 @@ class OnLoadTest(fixtures.ORMTest):
         class A(object):
             pass
 
-        def canary(instance): assert False
+        def canary(instance):
+            assert False
 
         try:
             instrumentation.register_class(A)
@@ -486,7 +501,8 @@ class OnLoadTest(fixtures.ORMTest):
 
 class NativeInstrumentationTest(fixtures.ORMTest):
     def test_register_reserved_attribute(self):
-        class T(object): pass
+        class T(object):
+            pass
 
         instrumentation.register_class(T)
         manager = instrumentation.manager_of_class(T)
@@ -507,7 +523,8 @@ class NativeInstrumentationTest(fixtures.ORMTest):
                   Column('id', Integer, primary_key=True),
                   Column(instrumentation.ClassManager.STATE_ATTR, Integer))
 
-        class T(object): pass
+        class T(object):
+            pass
 
         assert_raises(KeyError, mapper, T, t)
 
@@ -516,7 +533,8 @@ class NativeInstrumentationTest(fixtures.ORMTest):
                   Column('id', Integer, primary_key=True),
                   Column(instrumentation.ClassManager.MANAGER_ATTR, Integer))
 
-        class T(object): pass
+        class T(object):
+            pass
         assert_raises(KeyError, mapper, T, t)
 
 class Py3KFunctionInstTest(fixtures.ORMTest):
@@ -559,23 +577,23 @@ class Py3KFunctionInstTest(fixtures.ORMTest):
         cls, canary = self._kw_only_fixture()
 
         a = cls("a", b="b", c="c")
-        eq_(canary, [(('a', ), {'b':'b','c':'c'})])
+        eq_(canary, [(('a', ), {'b': 'b', 'c': 'c'})])
 
     def test_kw_plus_posn_args(self):
         cls, canary = self._kw_plus_posn_fixture()
 
         a = cls("a", 1, 2, 3, b="b", c="c")
-        eq_(canary, [(('a', 1, 2, 3), {'b':'b','c':'c'})])
+        eq_(canary, [(('a', 1, 2, 3), {'b': 'b', 'c': 'c'})])
 
     def test_kw_only_args_plus_opt(self):
         cls, canary = self._kw_opt_fixture()
 
         a = cls("a", b="b")
-        eq_(canary, [(('a', ), {'b':'b','c':'c'})])
+        eq_(canary, [(('a', ), {'b': 'b', 'c': 'c'})])
 
         canary[:] = []
         a = cls("a", b="b", c="d")
-        eq_(canary, [(('a', ), {'b':'b','c':'d'})])
+        eq_(canary, [(('a', ), {'b': 'b', 'c': 'd'})])
 
     def test_kw_only_sig(self):
         cls, canary = self._kw_only_fixture()
@@ -603,7 +621,8 @@ class MiscTest(fixtures.ORMTest):
         t = Table('t', MetaData(),
                   Column('id', Integer, primary_key=True),
                   Column('x', Integer))
-        class A(object): pass
+        class A(object):
+            pass
         mapper(A, t)
 
         a = A()
@@ -617,8 +636,10 @@ class MiscTest(fixtures.ORMTest):
         t2 = Table('t2', m,
                    Column('id', Integer, primary_key=True),
                    Column('t1_id', Integer, ForeignKey('t1.id')))
-        class A(object): pass
-        class B(object): pass
+        class A(object):
+            pass
+        class B(object):
+            pass
         mapper(A, t1, properties=dict(bs=relationship(B)))
         mapper(B, t2)
 
@@ -626,7 +647,8 @@ class MiscTest(fixtures.ORMTest):
         assert not a.bs
 
     def test_uninstrument(self):
-        class A(object):pass
+        class A(object):
+            pass
 
         manager = instrumentation.register_class(A)
         attributes.register_attribute(A, 'x', uselist=False, useobject=False)
@@ -654,8 +676,10 @@ class MiscTest(fixtures.ORMTest):
                 pass
 
         for base in object, Base:
-            class A(base): pass
-            class B(base): pass
+            class A(base):
+                pass
+            class B(base):
+                pass
             mapper(A, t1, properties=dict(bs=relationship(B, backref='a')))
             mapper(B, t2)
 
@@ -678,13 +702,17 @@ class MiscTest(fixtures.ORMTest):
                    Column('t1_id', Integer, ForeignKey('t1.id')))
 
         class Base(object):
-            def __init__(self): pass
+            def __init__(self):
+                pass
         class Base_AKW(object):
-            def __init__(self, *args, **kwargs): pass
+            def __init__(self, *args, **kwargs):
+                pass
 
         for base in object, Base, Base_AKW:
-            class A(base): pass
-            class B(base): pass
+            class A(base):
+                pass
+            class B(base):
+                pass
             mapper(A, t1)
             mapper(B, t2, properties=dict(a=relationship(A, backref='bs')))
 
diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py
index 1c31314d8..79514eaf4 100644
--- a/test/sql/test_defaults.py
+++ b/test/sql/test_defaults.py
@@ -1,7 +1,7 @@
-from sqlalchemy.testing import eq_, assert_raises, assert_raises_message
+from sqlalchemy.testing import eq_, assert_raises_message, assert_raises
 import datetime
 from sqlalchemy.schema import CreateSequence, DropSequence
-from sqlalchemy.sql import select, text, literal_column
+from sqlalchemy.sql import select, text
 import sqlalchemy as sa
 from sqlalchemy import testing
 from sqlalchemy.testing import engines
@@ -9,10 +9,11 @@ from sqlalchemy import MetaData, Integer, String, ForeignKey, Boolean, exc,\
                 Sequence, func, literal, Unicode
 from sqlalchemy.types import TypeDecorator, TypeEngine
 from sqlalchemy.testing.schema import Table, Column
-from sqlalchemy.testing import eq_
 from sqlalchemy.dialects import sqlite
 from sqlalchemy.testing import fixtures
 
+t = f = f2 = ts = currenttime = metadata = default_generator = None
+
 class DefaultTest(fixtures.TestBase):
 
     @classmethod
@@ -21,7 +22,7 @@ class DefaultTest(fixtures.TestBase):
 
         db = testing.db
         metadata = MetaData(db)
-        default_generator = {'x':50}
+        default_generator = {'x': 50}
 
         def mydefault():
             default_generator['x'] += 1
@@ -163,10 +164,10 @@ class DefaultTest(fixtures.TestBase):
         def fn4(x=1, y=2, z=3):
             eq_(x, 1)
         fn5 = list
-        class fn6(object):
+        class fn6a(object):
             def __init__(self, x):
                 eq_(x, "context")
-        class fn6(object):
+        class fn6b(object):
             def __init__(self, x, y=3):
                 eq_(x, "context")
         class FN7(object):
@@ -178,7 +179,7 @@ class DefaultTest(fixtures.TestBase):
                 eq_(x, "context")
         fn8 = FN8()
 
-        for fn in fn1, fn2, fn3, fn4, fn5, fn6, fn7, fn8:
+        for fn in fn1, fn2, fn3, fn4, fn5, fn6a, fn6b, fn7, fn8:
             c = sa.ColumnDefault(fn)
             c.arg("context")
 
@@ -288,7 +289,7 @@ class DefaultTest(fixtures.TestBase):
         eq_(set(r.context.postfetch_cols),
             set([t.c.col3, t.c.col5, t.c.col4, t.c.col6]))
 
-        eq_(t.select(t.c.col1==54).execute().fetchall(),
+        eq_(t.select(t.c.col1 == 54).execute().fetchall(),
             [(54, 'imthedefault', f, ts, ts, ctexec, True, False,
               12, today, None)])
 
@@ -296,10 +297,10 @@ class DefaultTest(fixtures.TestBase):
     def test_insertmany(self):
         # MySQL-Python 1.2.2 breaks functions in execute_many :(
         if (testing.against('mysql+mysqldb') and
-            testing.db.dialect.dbapi.version_info[:3] == (1, 2, 2)):
+                testing.db.dialect.dbapi.version_info[:3] == (1, 2, 2)):
             return
 
-        r = t.insert().execute({}, {}, {})
+        t.insert().execute({}, {}, {})
 
         ctexec = currenttime.scalar()
         l = t.select().execute()
@@ -342,13 +343,13 @@ class DefaultTest(fixtures.TestBase):
         assert_raises_message(exc.StatementError,
             "A value is required for bind parameter 'col7', in parameter group 1",
             t.insert().execute,
-            {'col4':7, 'col7':12, 'col8':19},
-            {'col4':7, 'col8':19},
-            {'col4':7, 'col7':12, 'col8':19},
+            {'col4': 7, 'col7': 12, 'col8': 19},
+            {'col4': 7, 'col8': 19},
+            {'col4': 7, 'col7': 12, 'col8': 19},
         )
 
     def test_insert_values(self):
-        t.insert(values={'col3':50}).execute()
+        t.insert(values={'col3': 50}).execute()
         l = t.select().execute()
         eq_(50, l.first()['col3'])
 
@@ -356,18 +357,18 @@ class DefaultTest(fixtures.TestBase):
     def test_updatemany(self):
         # MySQL-Python 1.2.2 breaks functions in execute_many :(
         if (testing.against('mysql+mysqldb') and
-            testing.db.dialect.dbapi.version_info[:3] == (1, 2, 2)):
+                testing.db.dialect.dbapi.version_info[:3] == (1, 2, 2)):
             return
 
         t.insert().execute({}, {}, {})
 
-        t.update(t.c.col1==sa.bindparam('pkval')).execute(
-            {'pkval':51,'col7':None, 'col8':None, 'boolcol1':False})
+        t.update(t.c.col1 == sa.bindparam('pkval')).execute(
+            {'pkval': 51, 'col7': None, 'col8': None, 'boolcol1': False})
 
-        t.update(t.c.col1==sa.bindparam('pkval')).execute(
-            {'pkval':51,},
-            {'pkval':52,},
-            {'pkval':53,})
+        t.update(t.c.col1 == sa.bindparam('pkval')).execute(
+            {'pkval': 51},
+            {'pkval': 52},
+            {'pkval': 53})
 
         l = t.select().execute()
         ctexec = currenttime.scalar()
@@ -384,9 +385,9 @@ class DefaultTest(fixtures.TestBase):
     def test_update(self):
         r = t.insert().execute()
         pk = r.inserted_primary_key[0]
-        t.update(t.c.col1==pk).execute(col4=None, col5=None)
+        t.update(t.c.col1 == pk).execute(col4=None, col5=None)
         ctexec = currenttime.scalar()
-        l = t.select(t.c.col1==pk).execute()
+        l = t.select(t.c.col1 == pk).execute()
         l = l.first()
         eq_(l,
             (pk, 'im the update', f2, None, None, ctexec, True, False,
@@ -397,8 +398,8 @@ class DefaultTest(fixtures.TestBase):
     def test_update_values(self):
         r = t.insert().execute()
         pk = r.inserted_primary_key[0]
-        t.update(t.c.col1==pk, values={'col3': 55}).execute()
-        l = t.select(t.c.col1==pk).execute()
+        t.update(t.c.col1 == pk, values={'col3': 55}).execute()
+        l = t.select(t.c.col1 == pk).execute()
         l = l.first()
         eq_(55, l['col3'])
 
@@ -429,7 +430,8 @@ class PKDefaultTest(fixtures.TablesTest):
         if not returning and not testing.db.dialect.implicit_returning:
             engine = testing.db
         else:
-            engine = engines.testing_engine(options={'implicit_returning':returning})
+            engine = engines.testing_engine(
+                            options={'implicit_returning': returning})
         engine.execute(t2.insert(), nextid=1)
         r = engine.execute(t1.insert(), data='hi')
         eq_([1], r.inserted_primary_key)
@@ -473,13 +475,13 @@ class PKIncrementTest(fixtures.TablesTest):
         self.assert_(last not in ids)
         ids.add(last)
 
-        rs = bind.execute(aitable.insert(values={'int1':func.length('four')}))
+        rs = bind.execute(aitable.insert(values={'int1': func.length('four')}))
         last = rs.inserted_primary_key[0]
         self.assert_(last)
         self.assert_(last not in ids)
         ids.add(last)
 
-        eq_(ids, set([1,2,3,4]))
+        eq_(ids, set([1, 2, 3, 4]))
 
         eq_(list(bind.execute(aitable.select().order_by(aitable.c.id))),
             [(1, 1, None), (2, None, 'row 2'), (3, 3, 'row 3'), (4, 4, None)])
@@ -508,18 +510,14 @@ class PKIncrementTest(fixtures.TablesTest):
 class EmptyInsertTest(fixtures.TestBase):
     @testing.exclude('sqlite', '<', (3, 3, 8), 'no empty insert support')
     @testing.fails_on('oracle', 'FIXME: unknown')
+    @testing.provide_metadata
     def test_empty_insert(self):
-        metadata = MetaData(testing.db)
-        t1 = Table('t1', metadata,
+        t1 = Table('t1', self.metadata,
                 Column('is_true', Boolean, server_default=('1')))
-        metadata.create_all()
-
-        try:
-            result = t1.insert().execute()
-            eq_(1, select([func.count(text('*'))], from_obj=t1).scalar())
-            eq_(True, t1.select().scalar())
-        finally:
-            metadata.drop_all()
+        self.metadata.create_all()
+        t1.insert().execute()
+        eq_(1, select([func.count(text('*'))], from_obj=t1).scalar())
+        eq_(True, t1.select().scalar())
 
 class AutoIncrementTest(fixtures.TablesTest):
     __requires__ = ('identity',)
@@ -563,7 +561,7 @@ class AutoIncrementTest(fixtures.TablesTest):
 
     def test_autoincrement_ignore_fk(self):
         m = MetaData()
-        y = Table('y', m,
+        Table('y', m,
             Column('id', Integer(), primary_key=True)
         )
         x = Table('x', m,
@@ -575,7 +573,7 @@ class AutoIncrementTest(fixtures.TablesTest):
 
     def test_autoincrement_fk_disqualifies(self):
         m = MetaData()
-        y = Table('y', m,
+        Table('y', m,
             Column('id', Integer(), primary_key=True)
         )
         x = Table('x', m,
@@ -593,15 +591,15 @@ class AutoIncrementTest(fixtures.TablesTest):
             Column('data', String(20)))
         nonai.create()
 
-
-        try:
+        def go():
             # postgresql + mysql strict will fail on first row,
             # mysql in legacy mode fails on second row
             nonai.insert().execute(data='row 1')
             nonai.insert().execute(data='row 2')
-            assert False
-        except sa.exc.DBAPIError, e:
-            assert True
+        assert_raises(
+            sa.exc.DBAPIError,
+            go
+        )
 
         nonai.insert().execute(id=1, data='row 1')
 
@@ -639,7 +637,7 @@ class SequenceExecTest(fixtures.TestBase):
 
     @classmethod
     def setup_class(cls):
-        cls.seq= Sequence("my_sequence")
+        cls.seq = Sequence("my_sequence")
         cls.seq.create(testing.db)
 
     @classmethod
@@ -702,7 +700,7 @@ class SequenceExecTest(fixtures.TestBase):
             Column('x', Integer)
         )
         t1.create(testing.db)
-        testing.db.execute(t1.insert(), [{'x':1}, {'x':300}, {'x':301}])
+        testing.db.execute(t1.insert(), [{'x': 1}, {'x': 300}, {'x': 301}])
         s = Sequence("my_sequence")
         eq_(
             testing.db.execute(
@@ -734,7 +732,7 @@ class SequenceExecTest(fixtures.TestBase):
         pk_col=next_value(), implicit returning is not used."""
 
         metadata = self.metadata
-        e = engines.testing_engine(options={'implicit_returning':False})
+        e = engines.testing_engine(options={'implicit_returning': False})
         s = Sequence("my_sequence")
         metadata.bind = e
         t1 = Table('t', metadata,
@@ -753,7 +751,7 @@ class SequenceExecTest(fixtures.TestBase):
         pk_col=next_value(), when implicit returning is used."""
 
         metadata = self.metadata
-        e = engines.testing_engine(options={'implicit_returning':True})
+        e = engines.testing_engine(options={'implicit_returning': True})
         s = Sequence("my_sequence")
         metadata.bind = e
         t1 = Table('t', metadata,
@@ -799,10 +797,10 @@ class SequenceTest(fixtures.TestBase, testing.AssertsCompiledSQL):
                 Sequence("my_seq", optional=True)):
             assert str(s.next_value().
                     compile(dialect=testing.db.dialect)) in (
-                "nextval('my_seq')",
-                "gen_id(my_seq, 1)",
-                "my_seq.nextval",
-            )
+                        "nextval('my_seq')",
+                        "gen_id(my_seq, 1)",
+                        "my_seq.nextval",
+                    )
 
     def test_nextval_unsupported(self):
         """test next_value() used on non-sequence platform
@@ -828,7 +826,7 @@ class SequenceTest(fixtures.TestBase, testing.AssertsCompiledSQL):
 
     def test_checkfirst_metadata(self):
         m = MetaData()
-        s = Sequence("my_sequence", metadata=m)
+        Sequence("my_sequence", metadata=m)
         m.create_all(testing.db, checkfirst=False)
         assert self._has_sequence('my_sequence')
         m.create_all(testing.db, checkfirst=True)
@@ -850,7 +848,7 @@ class SequenceTest(fixtures.TestBase, testing.AssertsCompiledSQL):
     @testing.provide_metadata
     def test_table_overrides_metadata_create(self):
         metadata = self.metadata
-        s1 = Sequence("s1", metadata=metadata)
+        Sequence("s1", metadata=metadata)
         s2 = Sequence("s2", metadata=metadata)
         s3 = Sequence("s3")
         t = Table('t', metadata,
@@ -877,7 +875,7 @@ class SequenceTest(fixtures.TestBase, testing.AssertsCompiledSQL):
         assert not self._has_sequence('s1')
         assert not self._has_sequence('s2')
 
-
+cartitems = sometable = metadata = None
 class TableBoundSequenceTest(fixtures.TestBase):
     __requires__ = ('sequences',)
 
@@ -890,10 +888,10 @@ class TableBoundSequenceTest(fixtures.TestBase):
             Column("description", String(40)),
             Column("createdate", sa.DateTime())
         )
-        sometable = Table( 'Manager', metadata,
-               Column('obj_id', Integer, Sequence('obj_id_seq'), ),
-               Column('name', String(128)),
-               Column('id', Integer, Sequence('Manager_id_seq', optional=True),
+        sometable = Table('Manager', metadata,
+                Column('obj_id', Integer, Sequence('obj_id_seq')),
+                Column('name', String(128)),
+                Column('id', Integer, Sequence('Manager_id_seq', optional=True),
                       primary_key=True),
            )
 
@@ -921,7 +919,8 @@ class TableBoundSequenceTest(fixtures.TestBase):
     def test_seq_nonpk(self):
         """test sequences fire off as defaults on non-pk columns"""
 
-        engine = engines.testing_engine(options={'implicit_returning':False})
+        engine = engines.testing_engine(
+                            options={'implicit_returning': False})
         result = engine.execute(sometable.insert(), name="somename")
 
         assert set(result.postfetch_cols()) == set([sometable.c.obj_id])
@@ -930,8 +929,8 @@ class TableBoundSequenceTest(fixtures.TestBase):
         assert set(result.postfetch_cols()) == set([sometable.c.obj_id])
 
         sometable.insert().execute(
-            {'name':'name3'},
-            {'name':'name4'})
+            {'name': 'name3'},
+            {'name': 'name4'})
         eq_(sometable.select().order_by(sometable.c.id).execute().fetchall(),
             [(1, "somename", 1),
              (2, "someother", 2),
@@ -980,7 +979,9 @@ class SpecialTypePKTest(fixtures.TestBase):
         r = t.insert().values(data=5).execute()
 
         # we don't pre-fetch 'server_default'.
-        if 'server_default' in kw and (not testing.db.dialect.implicit_returning or not implicit_returning):
+        if 'server_default' in kw and (not
+                    testing.db.dialect.implicit_returning or
+                    not implicit_returning):
             eq_(r.inserted_primary_key, [None])
         else:
             eq_(r.inserted_primary_key, ['INT_1'])
@@ -1109,7 +1110,7 @@ class ServerDefaultsOnPKTest(fixtures.TestBase):
     @testing.provide_metadata
     def test_int_default_none_on_insert_reflected(self):
         metadata = self.metadata
-        t = Table('x', metadata,
+        Table('x', metadata,
                 Column('y', Integer,
                         server_default='5', primary_key=True),
                 Column('data', String(10)),
@@ -1153,7 +1154,7 @@ class ServerDefaultsOnPKTest(fixtures.TestBase):
 
 class UnicodeDefaultsTest(fixtures.TestBase):
     def test_no_default(self):
-        c = Column(Unicode(32))
+        Column(Unicode(32))
 
     def test_unicode_default(self):
         # Py3K
@@ -1161,7 +1162,7 @@ class UnicodeDefaultsTest(fixtures.TestBase):
         # Py2K
         default = u'foo'
         # end Py2K
-        c = Column(Unicode(32), default=default)
+        Column(Unicode(32), default=default)
 
 
     def test_nonunicode_default(self):
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 407869f15..64dbb6204 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -74,7 +74,7 @@ class AdaptTest(fixtures.TestBase):
                 (DATE, "DATE"),
                 (TIME, ("TIME", "TIME WITHOUT TIME ZONE")),
                 (CLOB, "CLOB"),
-                (VARCHAR(10), ("VARCHAR(10)","VARCHAR(10 CHAR)")),
+                (VARCHAR(10), ("VARCHAR(10)", "VARCHAR(10 CHAR)")),
                 (NVARCHAR(10), ("NVARCHAR(10)", "NATIONAL VARCHAR(10)",
                                     "NVARCHAR2(10)")),
                 (CHAR, "CHAR"),
@@ -122,7 +122,7 @@ class AdaptTest(fixtures.TestBase):
                 t1 = typ()
             for cls in [typ] + typ.__subclasses__():
                 if not issubclass(typ, types.Enum) and \
-                    issubclass(cls, types.Enum):
+                        issubclass(cls, types.Enum):
                     continue
                 t2 = t1.adapt(cls)
                 assert t1 is not t2
@@ -283,8 +283,8 @@ class UserDefinedTest(fixtures.TablesTest, AssertsCompiledSQL):
     def test_typedecorator_impl(self):
         for impl_, exp, kw in [
             (Float, "FLOAT", {}),
-            (Float, "FLOAT(2)", {'precision':2}),
-            (Float(2), "FLOAT(2)", {'precision':4}),
+            (Float, "FLOAT(2)", {'precision': 2}),
+            (Float(2), "FLOAT(2)", {'precision': 4}),
             (Numeric(19, 2), "NUMERIC(19, 2)", {}),
         ]:
             for dialect_ in (dialects.postgresql, dialects.mssql, dialects.mysql):
@@ -466,7 +466,7 @@ class UserDefinedTest(fixtures.TablesTest, AssertsCompiledSQL):
                 return "VARCHAR(100)"
             def bind_processor(self, dialect):
                 def process(value):
-                    return "BIND_IN"+ value
+                    return "BIND_IN" + value
                 return process
             def result_processor(self, dialect, coltype):
                 def process(value):
@@ -479,13 +479,13 @@ class UserDefinedTest(fixtures.TablesTest, AssertsCompiledSQL):
             impl = String
             def bind_processor(self, dialect):
                 impl_processor = super(MyDecoratedType, self).bind_processor(dialect)\
-                                        or (lambda value:value)
+                                        or (lambda value: value)
                 def process(value):
-                    return "BIND_IN"+ impl_processor(value)
+                    return "BIND_IN" + impl_processor(value)
                 return process
             def result_processor(self, dialect, coltype):
                 impl_processor = super(MyDecoratedType, self).result_processor(dialect, coltype)\
-                                        or (lambda value:value)
+                                        or (lambda value: value)
                 def process(value):
                     return impl_processor(value) + "BIND_OUT"
                 return process
@@ -528,15 +528,15 @@ class UserDefinedTest(fixtures.TablesTest, AssertsCompiledSQL):
 
             def bind_processor(self, dialect):
                 impl_processor = super(MyUnicodeType, self).bind_processor(dialect)\
-                                        or (lambda value:value)
+                                        or (lambda value: value)
 
                 def process(value):
-                    return "BIND_IN"+ impl_processor(value)
+                    return "BIND_IN" + impl_processor(value)
                 return process
 
             def result_processor(self, dialect, coltype):
                 impl_processor = super(MyUnicodeType, self).result_processor(dialect, coltype)\
-                                        or (lambda value:value)
+                                        or (lambda value: value)
                 def process(value):
                     return impl_processor(value) + "BIND_OUT"
                 return process
@@ -545,17 +545,17 @@ class UserDefinedTest(fixtures.TablesTest, AssertsCompiledSQL):
                 return MyUnicodeType(self.impl.length)
 
         Table('users', metadata,
-            Column('user_id', Integer, primary_key = True),
+            Column('user_id', Integer, primary_key=True),
             # totall custom type
-            Column('goofy', MyType, nullable = False),
+            Column('goofy', MyType, nullable=False),
 
             # decorated type with an argument, so its a String
-            Column('goofy2', MyDecoratedType(50), nullable = False),
+            Column('goofy2', MyDecoratedType(50), nullable=False),
 
-            Column('goofy4', MyUnicodeType(50), nullable = False),
-            Column('goofy7', MyNewUnicodeType(50), nullable = False),
-            Column('goofy8', MyNewIntType, nullable = False),
-            Column('goofy9', MyNewIntSubClass, nullable = False),
+            Column('goofy4', MyUnicodeType(50), nullable=False),
+            Column('goofy7', MyNewUnicodeType(50), nullable=False),
+            Column('goofy8', MyNewIntType, nullable=False),
+            Column('goofy9', MyNewIntSubClass, nullable=False),
         )
 
 class VariantTest(fixtures.TestBase, AssertsCompiledSQL):
@@ -820,9 +820,9 @@ class EnumTest(fixtures.TestBase):
                         'but expression is of type text')
     def test_round_trip(self):
         enum_table.insert().execute([
-            {'id':1, 'someenum':'two'},
-            {'id':2, 'someenum':'two'},
-            {'id':3, 'someenum':'one'},
+            {'id': 1, 'someenum': 'two'},
+            {'id': 2, 'someenum': 'two'},
+            {'id': 3, 'someenum': 'one'},
         ])
 
         eq_(
@@ -836,9 +836,9 @@ class EnumTest(fixtures.TestBase):
 
     def test_non_native_round_trip(self):
         non_native_enum_table.insert().execute([
-            {'id':1, 'someenum':'two'},
-            {'id':2, 'someenum':'two'},
-            {'id':3, 'someenum':'one'},
+            {'id': 1, 'someenum': 'two'},
+            {'id': 2, 'someenum': 'two'},
+            {'id': 3, 'someenum': 'one'},
         ])
 
         eq_(
@@ -853,11 +853,11 @@ class EnumTest(fixtures.TestBase):
 
     def test_adapt(self):
         from sqlalchemy.dialects.postgresql import ENUM
-        e1 = Enum('one','two','three', native_enum=False)
+        e1 = Enum('one', 'two', 'three', native_enum=False)
         eq_(e1.adapt(ENUM).native_enum, False)
-        e1 = Enum('one','two','three', native_enum=True)
+        e1 = Enum('one', 'two', 'three', native_enum=True)
         eq_(e1.adapt(ENUM).native_enum, True)
-        e1 = Enum('one','two','three', name='foo', schema='bar')
+        e1 = Enum('one', 'two', 'three', name='foo', schema='bar')
         eq_(e1.adapt(ENUM).name, 'foo')
         eq_(e1.adapt(ENUM).schema, 'bar')
 
@@ -867,7 +867,7 @@ class EnumTest(fixtures.TestBase):
     def test_constraint(self):
         assert_raises(exc.DBAPIError,
             enum_table.insert().execute,
-            {'id':4, 'someenum':'four'}
+            {'id': 4, 'someenum': 'four'}
         )
 
     @testing.fails_on('mysql',
@@ -875,7 +875,7 @@ class EnumTest(fixtures.TestBase):
     def test_non_native_constraint(self):
         assert_raises(exc.DBAPIError,
             non_native_enum_table.insert().execute,
-            {'id':4, 'someenum':'four'}
+            {'id': 4, 'someenum': 'four'}
         )
 
     def test_mock_engine_no_prob(self):
@@ -938,8 +938,8 @@ class BinaryTest(fixtures.TestBase, AssertsExecutionResults):
         testobj2 = pickleable.Foo('im foo 2')
         testobj3 = pickleable.Foo('im foo 3')
 
-        stream1 =self.load_stream('binary_data_one.dat')
-        stream2 =self.load_stream('binary_data_two.dat')
+        stream1 = self.load_stream('binary_data_one.dat')
+        stream2 = self.load_stream('binary_data_two.dat')
         binary_table.insert().execute(
                             primary_id=1,
                             misc='binary_data_one.dat',
@@ -964,9 +964,9 @@ class BinaryTest(fixtures.TestBase, AssertsExecutionResults):
             binary_table.select(order_by=binary_table.c.primary_id),
             text(
                 "select * from binary_table order by binary_table.primary_id",
-                typemap={'pickled':PickleType,
-                        'mypickle':MyPickleType,
-                        'data':LargeBinary, 'data_slice':LargeBinary},
+                typemap={'pickled': PickleType,
+                        'mypickle': MyPickleType,
+                        'data': LargeBinary, 'data_slice': LargeBinary},
                 bind=testing.db)
         ):
             l = stmt.execute().fetchall()
@@ -987,7 +987,9 @@ class BinaryTest(fixtures.TestBase, AssertsExecutionResults):
 
         data = os.urandom(32)
         binary_table.insert().execute(data=data)
-        eq_(binary_table.select().where(binary_table.c.data==data).alias().count().scalar(), 1)
+        eq_(binary_table.select().
+                    where(binary_table.c.data == data).alias().
+                    count().scalar(), 1)
 
 
     def load_stream(self, name):
@@ -1013,8 +1015,8 @@ class ExpressionTest(fixtures.TestBase, AssertsExecutionResults, AssertsCompiled
                     return value / 10
                 return process
             def adapt_operator(self, op):
-                return {operators.add:operators.sub,
-                    operators.sub:operators.add}.get(op, op)
+                return {operators.add: operators.sub,
+                    operators.sub: operators.add}.get(op, op)
 
         class MyTypeDec(types.TypeDecorator):
             impl = String
@@ -1037,10 +1039,10 @@ class ExpressionTest(fixtures.TestBase, AssertsExecutionResults, AssertsCompiled
         meta.create_all()
 
         test_table.insert().execute({
-                                'id':1,
-                                'data':'somedata',
-                                'atimestamp':datetime.date(2007, 10, 15),
-                                'avalue':25, 'bvalue':'foo'})
+                                'id': 1,
+                                'data': 'somedata',
+                                'atimestamp': datetime.date(2007, 10, 15),
+                                'avalue': 25, 'bvalue': 'foo'})
 
     @classmethod
     def teardown_class(cls):
@@ -1064,7 +1066,7 @@ class ExpressionTest(fixtures.TestBase, AssertsExecutionResults, AssertsCompiled
             testing.db.execute(
                     select([test_table.c.id, test_table.c.data, test_table.c.atimestamp])
                     .where(expr),
-                    {"thedate":datetime.date(2007, 10, 15)}).fetchall(),
+                    {"thedate": datetime.date(2007, 10, 15)}).fetchall(),
             [(1, 'somedata', datetime.date(2007, 10, 15))]
         )
 
@@ -1083,7 +1085,7 @@ class ExpressionTest(fixtures.TestBase, AssertsExecutionResults, AssertsCompiled
 
         eq_(
             testing.db.execute(test_table.select().where(expr),
-                {"somevalue":"foo"}).fetchall(),
+                {"somevalue": "foo"}).fetchall(),
             [(1, 'somedata',
                 datetime.date(2007, 10, 15), 25, 'BIND_INfooBIND_OUT')]
         )
@@ -1347,7 +1349,7 @@ class NumericRawSQLTest(fixtures.TestBase):
     @testing.provide_metadata
     def test_decimal_fp(self):
         metadata = self.metadata
-        t = self._fixture(metadata, Numeric(10, 5), decimal.Decimal("45.5"))
+        self._fixture(metadata, Numeric(10, 5), decimal.Decimal("45.5"))
         val = testing.db.execute("select val from t").scalar()
         assert isinstance(val, decimal.Decimal)
         eq_(val, decimal.Decimal("45.5"))
@@ -1356,7 +1358,7 @@ class NumericRawSQLTest(fixtures.TestBase):
     @testing.provide_metadata
     def test_decimal_int(self):
         metadata = self.metadata
-        t = self._fixture(metadata, Numeric(10, 5), decimal.Decimal("45"))
+        self._fixture(metadata, Numeric(10, 5), decimal.Decimal("45"))
         val = testing.db.execute("select val from t").scalar()
         assert isinstance(val, decimal.Decimal)
         eq_(val, decimal.Decimal("45"))
@@ -1364,7 +1366,7 @@ class NumericRawSQLTest(fixtures.TestBase):
     @testing.provide_metadata
     def test_ints(self):
         metadata = self.metadata
-        t = self._fixture(metadata, Integer, 45)
+        self._fixture(metadata, Integer, 45)
         val = testing.db.execute("select val from t").scalar()
         assert isinstance(val, (int, long))
         eq_(val, 45)
@@ -1372,7 +1374,7 @@ class NumericRawSQLTest(fixtures.TestBase):
     @testing.provide_metadata
     def test_float(self):
         metadata = self.metadata
-        t = self._fixture(metadata, Float, 46.583)
+        self._fixture(metadata, Float, 46.583)
         val = testing.db.execute("select val from t").scalar()
         assert isinstance(val, float)
 
@@ -1505,7 +1507,7 @@ class PickleTest(fixtures.TestBase):
         p1 = PickleType()
 
         for obj in (
-            {'1':'2'},
+            {'1': '2'},
             pickleable.Bar(5, 6),
             pickleable.OldSchool(10, 11)
         ):
@@ -1520,7 +1522,7 @@ class PickleTest(fixtures.TestBase):
         p1 = PickleType()
 
         for obj in (
-            {'1':'2'},
+            {'1': '2'},
             pickleable.Bar(5, 6),
             pickleable.OldSchool(10, 11)
         ):