Make all tests to be PEP8 compliant

tested using pycodestyle version 2.2.0

Fixes: #3885
Change-Id: I5df43adc3aefe318f9eeab72a078247a548ec566
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/343

8 files changed, 401 insertions, 429 deletions

diff --git a/test/engine/test_bind.py b/test/engine/test_bind.py
index 69ab721c1..a084a849f 100644
--- a/test/engine/test_bind.py
+++ b/test/engine/test_bind.py
@@ -38,8 +38,7 @@ class BindTest(fixtures.TestBase):
 
     def test_create_drop_explicit(self):
         metadata = MetaData()
-        table = Table('test_table', metadata,
-            Column('foo', Integer))
+        table = Table('test_table', metadata, Column('foo', Integer))
         for bind in (
             testing.db,
             testing.db.connect()
@@ -67,8 +66,7 @@ class BindTest(fixtures.TestBase):
 
     def test_create_drop_err_table(self):
         metadata = MetaData()
-        table = Table('test_table', metadata,
-            Column('foo', Integer))
+        table = Table('test_table', metadata, Column('foo', Integer))
 
         for meth in [
             table.exists,
@@ -91,8 +89,7 @@ class BindTest(fixtures.TestBase):
                 testing.db.connect()
             ):
                 metadata = meta()
-                table = Table('test_table', metadata,
-                Column('foo', Integer))
+                table = Table('test_table', metadata, Column('foo', Integer))
                 metadata.bind = bind
                 assert metadata.bind is table.bind is bind
                 metadata.create_all()
@@ -103,8 +100,7 @@ class BindTest(fixtures.TestBase):
                 assert not table.exists()
 
                 metadata = meta()
-                table = Table('test_table', metadata,
-                    Column('foo', Integer))
+                table = Table('test_table', metadata, Column('foo', Integer))
 
                 metadata.bind = bind
 
@@ -130,7 +126,7 @@ class BindTest(fixtures.TestBase):
                 ):
                     metadata = MetaData(*args[0], **args[1])
                     table = Table('test_table', metadata,
-                        Column('foo', Integer))
+                                  Column('foo', Integer))
                     assert metadata.bind is table.bind is bind
                     metadata.create_all()
                     assert table.exists()
@@ -145,9 +141,8 @@ class BindTest(fixtures.TestBase):
     def test_implicit_execution(self):
         metadata = MetaData()
         table = Table('test_table', metadata,
-            Column('foo', Integer),
-            test_needs_acid=True,
-            )
+                      Column('foo', Integer),
+                      test_needs_acid=True)
         conn = testing.db.connect()
         metadata.create_all(bind=conn)
         try:
@@ -167,14 +162,13 @@ class BindTest(fixtures.TestBase):
 
     def test_clauseelement(self):
         metadata = MetaData()
-        table = Table('test_table', metadata,
-            Column('foo', Integer))
+        table = Table('test_table', metadata, Column('foo', Integer))
         metadata.create_all(bind=testing.db)
         try:
             for elem in [
                 table.select,
                 lambda **kwargs: sa.func.current_timestamp(**kwargs).select(),
-               # func.current_timestamp().select,
+                # func.current_timestamp().select,
                 lambda **kwargs:text("select * from test_table", **kwargs)
             ]:
                 for bind in (
diff --git a/test/engine/test_ddlevents.py b/test/engine/test_ddlevents.py
index 8beb255eb..80dd8084b 100644
--- a/test/engine/test_ddlevents.py
+++ b/test/engine/test_ddlevents.py
@@ -297,15 +297,15 @@ class DDLEventTest(fixtures.TestBase):
     def test_append_listener(self):
         metadata, table, bind = self.metadata, self.table, self.bind
 
-        fn = lambda *a: None
+        def fn(*a): return None
 
         table.append_ddl_listener('before-create', fn)
         assert_raises(exc.InvalidRequestError, table.append_ddl_listener,
-                                        'blah', fn)
+                      'blah', fn)
 
         metadata.append_ddl_listener('before-create', fn)
         assert_raises(exc.InvalidRequestError, metadata.append_ddl_listener,
-                                        'blah', fn)
+                      'blah', fn)
 
 
 class DDLExecutionTest(fixtures.TestBase):
@@ -386,17 +386,13 @@ class DDLExecutionTest(fixtures.TestBase):
         metadata, users, engine = self.metadata, self.users, self.engine
         canary = []
         users.append_ddl_listener('before-create',
-                            lambda e, t, b: canary.append('mxyzptlk')
-                        )
+                                  lambda e, t, b: canary.append('mxyzptlk'))
         users.append_ddl_listener('after-create',
-                            lambda e, t, b: canary.append('klptzyxm')
-                        )
+                                  lambda e, t, b: canary.append('klptzyxm'))
         users.append_ddl_listener('before-drop',
-                            lambda e, t, b: canary.append('xyzzy')
-                        )
+                                  lambda e, t, b: canary.append('xyzzy'))
         users.append_ddl_listener('after-drop',
-                            lambda e, t, b: canary.append('fnord')
-                        )
+                                  lambda e, t, b: canary.append('fnord'))
 
         metadata.create_all()
         assert 'mxyzptlk' in canary
@@ -414,18 +410,22 @@ class DDLExecutionTest(fixtures.TestBase):
     def test_deprecated_append_ddl_listener_metadata(self):
         metadata, users, engine = self.metadata, self.users, self.engine
         canary = []
-        metadata.append_ddl_listener('before-create',
-                            lambda e, t, b, tables=None: canary.append('mxyzptlk')
-                        )
-        metadata.append_ddl_listener('after-create',
-                            lambda e, t, b, tables=None: canary.append('klptzyxm')
-                        )
-        metadata.append_ddl_listener('before-drop',
-                            lambda e, t, b, tables=None: canary.append('xyzzy')
-                        )
-        metadata.append_ddl_listener('after-drop',
-                            lambda e, t, b, tables=None: canary.append('fnord')
-                        )
+        metadata.append_ddl_listener(
+            'before-create',
+            lambda e, t, b, tables=None: canary.append('mxyzptlk')
+        )
+        metadata.append_ddl_listener(
+            'after-create',
+            lambda e, t, b, tables=None: canary.append('klptzyxm')
+        )
+        metadata.append_ddl_listener(
+            'before-drop',
+            lambda e, t, b, tables=None: canary.append('xyzzy')
+        )
+        metadata.append_ddl_listener(
+            'after-drop',
+            lambda e, t, b, tables=None: canary.append('fnord')
+        )
 
         metadata.create_all()
         assert 'mxyzptlk' in canary
@@ -490,7 +490,7 @@ class DDLExecutionTest(fixtures.TestBase):
         nonpg_mock = engines.mock_engine(dialect_name='sqlite')
         pg_mock = engines.mock_engine(dialect_name='postgresql')
         constraint = CheckConstraint('a < b', name='my_test_constraint',
-                                    table=users)
+                                     table=users)
 
         # by placing the constraint in an Add/Drop construct, the
         # 'inline_ddl' flag is set to False
@@ -526,7 +526,7 @@ class DDLExecutionTest(fixtures.TestBase):
         nonpg_mock = engines.mock_engine(dialect_name='sqlite')
         pg_mock = engines.mock_engine(dialect_name='postgresql')
         constraint = CheckConstraint('a < b', name='my_test_constraint',
-                                    table=users)
+                                     table=users)
 
         # by placing the constraint in an Add/Drop construct, the
         # 'inline_ddl' flag is set to False
@@ -611,11 +611,11 @@ class DDLExecutionTest(fixtures.TestBase):
 
 class DDLTest(fixtures.TestBase, AssertsCompiledSQL):
     def mock_engine(self):
-        executor = lambda *a, **kw: None
+        def executor(*a, **kw): return None
         engine = create_engine(testing.db.name + '://',
                                strategy='mock', executor=executor)
         engine.dialect.identifier_preparer = \
-           tsa.sql.compiler.IdentifierPreparer(engine.dialect)
+            tsa.sql.compiler.IdentifierPreparer(engine.dialect)
         return engine
 
     def test_tokens(self):
@@ -639,8 +639,7 @@ class DDLTest(fixtures.TestBase, AssertsCompiledSQL):
         # overrides are used piece-meal and verbatim.
 
         ddl = DDL('%(schema)s-%(table)s-%(fullname)s-%(bonus)s',
-                  context={'schema': 'S S', 'table': 'T T', 'bonus': 'b'
-                  })
+                  context={'schema': 'S S', 'table': 'T T', 'bonus': 'b'})
         self.assert_compile(ddl.against(sane_alone), 'S S-T T-t-b',
                             dialect=dialect)
         self.assert_compile(ddl.against(sane_schema), 'S S-T T-s.t-b',
@@ -659,9 +658,9 @@ class DDLTest(fixtures.TestBase, AssertsCompiledSQL):
         assert DDL('')._should_execute(tbl, cx)
         assert DDL('').execute_if(dialect=target)._should_execute(tbl, cx)
         assert not DDL('').execute_if(dialect='bogus').\
-                        _should_execute(tbl, cx)
+            _should_execute(tbl, cx)
         assert DDL('').execute_if(callable_=lambda d, y, z, **kw: True).\
-                        _should_execute(tbl, cx)
+            _should_execute(tbl, cx)
         assert(DDL('').execute_if(
                         callable_=lambda d, y, z, **kw: z.engine.name
                         != 'bogus').
@@ -677,9 +676,9 @@ class DDLTest(fixtures.TestBase, AssertsCompiledSQL):
         assert DDL('')._should_execute_deprecated('x', tbl, cx)
         assert DDL('', on=target)._should_execute_deprecated('x', tbl, cx)
         assert not DDL('', on='bogus').\
-                        _should_execute_deprecated('x', tbl, cx)
+            _should_execute_deprecated('x', tbl, cx)
         assert DDL('', on=lambda d, x, y, z: True).\
-                        _should_execute_deprecated('x', tbl, cx)
+            _should_execute_deprecated('x', tbl, cx)
         assert(DDL('', on=lambda d, x, y, z: z.engine.name != 'bogus').
                _should_execute_deprecated('x', tbl, cx))
 
diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index c9f78aa5e..145877dd3 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -515,7 +515,6 @@ class ExecuteTest(fixtures.TestBase):
         conn.close()
         eng.dispose()
 
-
         conn = eng.connect()
         conn.close()
 
@@ -877,9 +876,10 @@ class MockStrategyTest(fixtures.TestBase):
         engine, buf = self._engine_fixture()
         metadata = MetaData()
         t = Table('testtable', metadata,
-                  Column(
-                      'pk', Integer, Sequence('testtable_pk_seq'), primary_key=True)
-                  )
+                  Column('pk',
+                         Integer,
+                         Sequence('testtable_pk_seq'),
+                         primary_key=True))
 
         t.create(engine)
         t.drop(engine)
@@ -1292,7 +1292,7 @@ class EngineEventsTest(fixtures.TestBase):
                 engines.testing_engine(options=dict(implicit_returning=False,
                                                     strategy='threadlocal')),
                 engines.testing_engine(options=dict(implicit_returning=False)).
-            connect()
+                connect()
         ]:
             event.listen(engine, 'before_execute', execute)
             event.listen(engine, 'before_cursor_execute', cursor_execute)
@@ -2054,7 +2054,8 @@ class HandleInvalidatedOnConnectTest(fixtures.TestBase):
         def handle_error(ctx):
             assert ctx.engine is eng
             assert ctx.connection is conn
-            assert isinstance(ctx.sqlalchemy_exception, tsa.exc.ProgrammingError)
+            assert isinstance(ctx.sqlalchemy_exception,
+                              tsa.exc.ProgrammingError)
             raise MySpecialException("failed operation")
 
         conn = eng.connect()
@@ -2312,9 +2313,9 @@ class ProxyConnectionTest(fixtures.TestBase):
                         ('INSERT INTO t1 (c1, c2)', {'c1': 6}, None),
                         ('select * from t1', {}, None),
                         ('DROP TABLE t1', {}, None)]
-            if not testing.against('oracle+zxjdbc'):  # or engine.dialect.pr
-                                                      # eexecute_pk_sequence
-                                                      # s:
+            # or engine.dialect.pr eexecute_pk_sequence s:
+            # original comment above moved here for pep8 fix
+            if not testing.against('oracle+zxjdbc'):
                 cursor = [
                     ('CREATE TABLE t1', {}, ()),
                     ('INSERT INTO t1 (c1, c2)', {
@@ -2634,5 +2635,3 @@ class DialectEventTest(fixtures.TestBase):
         conn.connection.invalidate()
         conn = e.connect()
         eq_(conn.info['boom'], "one")
-
-
diff --git a/test/engine/test_logging.py b/test/engine/test_logging.py
index e9bc23b41..fa36612c0 100644
--- a/test/engine/test_logging.py
+++ b/test/engine/test_logging.py
@@ -189,7 +189,8 @@ class LogParamsTest(fixtures.TestBase):
             r"\[{'data': '0'}, {'data': '1'}, {'data': '2'}, "
             r"{'data': '3'}, {'data': '4'}, {'data': '5'}, "
             r"{'data': '6'}, {'data': '7'}  ... displaying 10 of "
-            r"100 total bound parameter sets ...  {'data': '98'}, {'data': '99'}\]",
+            r"100 total bound parameter sets ...  {'data': '98'}, "
+            r"{'data': '99'}\]",
             lambda: self.eng.execute(
                 "INSERT INTO nonexistent (data) values (:data)",
                 [{"data": str(i)} for i in range(100)]
@@ -200,8 +201,8 @@ class LogParamsTest(fixtures.TestBase):
         assert_raises_message(
             tsa.exc.DBAPIError,
             r".*INSERT INTO nonexistent \(data\) values "
-            r"\(\?\)'\] \[parameters: \[\('0',\), \('1',\), \('2',\), \('3',\), "
-            r"\('4',\), \('5',\), \('6',\), \('7',\)  "
+            r"\(\?\)'\] \[parameters: \[\('0',\), \('1',\), \('2',\), "
+            r"\('3',\), \('4',\), \('5',\), \('6',\), \('7',\)  "
             r"... displaying "
             r"10 of 100 total bound parameter sets ...  "
             r"\('98',\), \('99',\)\]",
diff --git a/test/engine/test_parseconnect.py b/test/engine/test_parseconnect.py
index 894fff280..07fedbe31 100644
--- a/test/engine/test_parseconnect.py
+++ b/test/engine/test_parseconnect.py
@@ -94,8 +94,8 @@ class DialectImportTest(fixtures.TestBase):
                 'sqlite',
                 'oracle',
                 'mssql'):
-            exec ('from sqlalchemy.dialects import %s\ndialect = '
-                  '%s.dialect()' % (name, name), globals())
+            exec('from sqlalchemy.dialects import %s\ndialect = '
+                 '%s.dialect()' % (name, name), globals())
             eq_(dialect.name, name)
 
 
@@ -440,5 +440,6 @@ def MockDBAPI(**assert_kwargs):
         connect=Mock(side_effect=connect)
     )
 
+
 mock_dbapi = MockDBAPI()
 mock_sqlite_dbapi = msd = MockDBAPI()
diff --git a/test/engine/test_processors.py b/test/engine/test_processors.py
index 47302af97..83b5a7948 100644
--- a/test/engine/test_processors.py
+++ b/test/engine/test_processors.py
@@ -34,7 +34,6 @@ class _BooleanProcessorTest(fixtures.TestBase):
         )
 
 
-
 class PyBooleanProcessorTest(_BooleanProcessorTest):
     @classmethod
     def setup_class(cls):
@@ -129,12 +128,12 @@ class PyDateProcessorTest(_DateProcessorTest):
     @classmethod
     def setup_class(cls):
         from sqlalchemy import processors
-        cls.module = type("util", (object,),
-                dict(
-                    (k, staticmethod(v))
-                        for k, v in list(processors.py_fallback().items())
-                )
-            )
+        cls.module = type(
+            "util",
+            (object,),
+            dict((k, staticmethod(v))
+                 for k, v in list(processors.py_fallback().items()))
+        )
 
 
 class CDateProcessorTest(_DateProcessorTest):
@@ -233,11 +232,11 @@ class PyDistillArgsTest(_DistillArgsTest):
     @classmethod
     def setup_class(cls):
         from sqlalchemy.engine import util
-        cls.module = type("util", (object,),
-                dict(
-                    (k, staticmethod(v))
-                        for k, v in list(util.py_fallback().items())
-                )
+        cls.module = type(
+            "util",
+            (object,),
+            dict((k, staticmethod(v))
+                 for k, v in list(util.py_fallback().items()))
         )
 
 
diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py
index 9ddfe940f..e2a204e7b 100644
--- a/test/engine/test_reflection.py
+++ b/test/engine/test_reflection.py
@@ -28,23 +28,23 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         meta = self.metadata
 
         users = Table('engine_users', meta,
-            Column('user_id', sa.INT, primary_key=True),
-            Column('user_name', sa.VARCHAR(20), nullable=False),
-            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('test5', sa.Date),
-            Column('parent_user_id', sa.Integer,
-                   sa.ForeignKey('engine_users.user_id')),
-            Column('test6', sa.Date, nullable=False),
-            Column('test7', sa.Text),
-            Column('test8', sa.LargeBinary),
-            Column('test_passivedefault2', sa.Integer, server_default='5'),
-            Column('test9', sa.LargeBinary(100)),
-            Column('test10', sa.Numeric(10, 2)),
-            test_needs_fk=True,
-        )
+                      Column('user_id', sa.INT, primary_key=True),
+                      Column('user_name', sa.VARCHAR(20), nullable=False),
+                      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('test5', sa.Date),
+                      Column('parent_user_id', sa.Integer,
+                             sa.ForeignKey('engine_users.user_id')),
+                      Column('test6', sa.Date, nullable=False),
+                      Column('test7', sa.Text),
+                      Column('test8', sa.LargeBinary),
+                      Column('test_passivedefault2',
+                             sa.Integer, server_default='5'),
+                      Column('test9', sa.LargeBinary(100)),
+                      Column('test10', sa.Numeric(10, 2)),
+                      test_needs_fk=True)
 
         addresses = Table(
             'engine_email_addresses',
@@ -62,7 +62,9 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
                                 autoload=True,
                                 autoload_with=testing.db)
         reflected_addresses = Table('engine_email_addresses',
-                meta2, autoload=True, autoload_with=testing.db)
+                                    meta2,
+                                    autoload=True,
+                                    autoload_with=testing.db)
         self.assert_tables_equal(users, reflected_users)
         self.assert_tables_equal(addresses, reflected_addresses)
 
@@ -78,8 +80,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         meta.create_all()
 
         meta2 = MetaData()
-        reflected_t = Table('t',  meta2,
-                autoload_with=testing.db)
+        reflected_t = Table('t',  meta2, autoload_with=testing.db)
         self.assert_tables_equal(t, reflected_t)
 
     @testing.provide_metadata
@@ -93,12 +94,14 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
             Column('t3id', sa.Integer, sa.ForeignKey('t3.id')),
             test_needs_fk=True,
             )
-        Table('t2', meta,
-                    Column('id', sa.Integer, primary_key=True),
-                    test_needs_fk=True)
-        Table('t3', meta,
-                    Column('id', sa.Integer, primary_key=True),
-                    test_needs_fk=True)
+        Table('t2',
+              meta,
+              Column('id', sa.Integer, primary_key=True),
+              test_needs_fk=True)
+        Table('t3',
+              meta,
+              Column('id', sa.Integer, primary_key=True),
+              test_needs_fk=True)
         meta.create_all()
         meta2 = MetaData()
         t1r, t2r, t3r = [Table(x, meta2, autoload=True,
@@ -145,11 +148,10 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         meta = self.metadata
 
         Table('t', meta,
-            Column('id', Integer, primary_key=True),
-            Column('x', Integer),
-            Column('y', Integer),
-            Column('z', Integer, server_default="5"),
-        )
+              Column('id', Integer, primary_key=True),
+              Column('x', Integer),
+              Column('y', Integer),
+              Column('z', Integer, server_default="5"))
         meta.create_all()
 
         m2 = MetaData()
@@ -159,9 +161,9 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         t2 = Table('t', m2, old_z, old_q)
         eq_(t2.primary_key.columns, (t2.c.z, ))
         t2 = Table('t', m2, old_y,
-                        extend_existing=True,
-                        autoload=True,
-                        autoload_with=testing.db)
+                   extend_existing=True,
+                   autoload=True,
+                   autoload_with=testing.db)
         eq_(
             set(t2.columns.keys()),
             set(['x', 'y', 'z', 'q', 'id'])
@@ -175,8 +177,8 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         m3 = MetaData()
         t3 = Table('t', m3, Column('z', Integer))
         t3 = Table('t', m3, extend_existing=False,
-                        autoload=True,
-                        autoload_with=testing.db)
+                   autoload=True,
+                   autoload_with=testing.db)
         eq_(
             set(t3.columns.keys()),
             set(['z'])
@@ -189,10 +191,10 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         t4 = Table('t', m4, old_z, old_q)
         eq_(t4.primary_key.columns, (t4.c.z, ))
         t4 = Table('t', m4, old_y,
-                        extend_existing=True,
-                        autoload=True,
-                        autoload_replace=False,
-                        autoload_with=testing.db)
+                   extend_existing=True,
+                   autoload=True,
+                   autoload_replace=False,
+                   autoload_with=testing.db)
         eq_(
             set(t4.columns.keys()),
             set(['x', 'y', 'z', 'q', 'id'])
@@ -265,15 +267,15 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         """
         Table('a', self.metadata, Column('id', Integer, primary_key=True))
         Table('b', self.metadata, Column('id', Integer, primary_key=True),
-                                    Column('a_id', Integer))
+              Column('a_id', Integer))
         self.metadata.create_all()
 
         m2 = MetaData()
         b2 = Table('b', m2, Column('a_id', Integer, sa.ForeignKey('a.id')))
         a2 = Table('a', m2, autoload=True, autoload_with=testing.db)
         b2 = Table('b', m2, extend_existing=True, autoload=True,
-                                autoload_with=testing.db,
-                                autoload_replace=False)
+                   autoload_with=testing.db,
+                   autoload_replace=False)
 
         assert b2.c.id is not None
         assert b2.c.a_id.references(a2.c.id)
@@ -288,15 +290,15 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         """
         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')))
+              Column('a_id', Integer, sa.ForeignKey('a.id')))
         self.metadata.create_all()
 
         m2 = MetaData()
         b2 = Table('b', m2, Column('a_id', Integer, sa.ForeignKey('a.id')))
         a2 = Table('a', m2, autoload=True, autoload_with=testing.db)
         b2 = Table('b', m2, extend_existing=True, autoload=True,
-                                autoload_with=testing.db,
-                                autoload_replace=False)
+                   autoload_with=testing.db,
+                   autoload_replace=False)
 
         assert b2.c.id is not None
         assert b2.c.a_id.references(a2.c.id)
@@ -310,15 +312,15 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         """
         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')))
+              Column('a_id', Integer, sa.ForeignKey('a.id')))
         self.metadata.create_all()
 
         m2 = MetaData()
         b2 = Table('b', m2, Column('a_id', Integer))
         a2 = Table('a', m2, autoload=True, autoload_with=testing.db)
         b2 = Table('b', m2, extend_existing=True, autoload=True,
-                                autoload_with=testing.db,
-                                autoload_replace=False)
+                   autoload_with=testing.db,
+                   autoload_replace=False)
 
         assert b2.c.id is not None
         assert not b2.c.a_id.references(a2.c.id)
@@ -333,7 +335,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         a2 = Table('a', m2, Column('id', Integer, primary_key=True))
 
         Table('a', m2, autoload=True, autoload_with=testing.db,
-                        autoload_replace=False, extend_existing=True)
+              autoload_replace=False, extend_existing=True)
         eq_(list(a2.primary_key), [a2.c.id])
 
     def test_autoload_replace_arg(self):
@@ -370,7 +372,6 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         t2a = Table('test2', m2, autoload=True)
         assert t2a._autoincrement_column is None
 
-
     @skip('sqlite')
     @testing.provide_metadata
     def test_unknown_types(self):
@@ -381,7 +382,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         """
         meta = self.metadata
         t = Table("test", meta,
-            Column('foo', sa.DateTime))
+                  Column('foo', sa.DateTime))
 
         ischema_names = testing.db.dialect.ischema_names
         t.create()
@@ -448,18 +449,18 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         meta = self.metadata
         Table('users', meta,
-            Column('id', sa.Integer, primary_key=True),
-            Column('name', sa.String(30)))
+              Column('id', sa.Integer, primary_key=True),
+              Column('name', sa.String(30)))
         Table('addresses', meta,
-            Column('id', sa.Integer, primary_key=True),
-            Column('street', sa.String(30)))
+              Column('id', sa.Integer, primary_key=True),
+              Column('street', sa.String(30)))
 
         meta.create_all()
         meta2 = MetaData(testing.db)
         a2 = Table('addresses', meta2,
-            Column('id', sa.Integer,
-                   sa.ForeignKey('users.id'), primary_key=True),
-            autoload=True)
+                   Column('id', sa.Integer,
+                          sa.ForeignKey('users.id'), primary_key=True),
+                   autoload=True)
         u2 = Table('users', meta2, autoload=True)
 
         assert list(a2.primary_key) == [a2.c.id]
@@ -469,9 +470,9 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         meta3 = MetaData(testing.db)
         u3 = Table('users', meta3, autoload=True)
         a3 = Table('addresses', meta3,
-            Column('id', sa.Integer, sa.ForeignKey('users.id'),
-                   primary_key=True),
-            autoload=True)
+                   Column('id', sa.Integer, sa.ForeignKey('users.id'),
+                          primary_key=True),
+                   autoload=True)
 
         assert list(a3.primary_key) == [a3.c.id]
         assert list(u3.primary_key) == [u3.c.id]
@@ -485,18 +486,18 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         meta = self.metadata
         Table('users', meta,
-            Column('id', sa.Integer, primary_key=True),
-            Column('name', sa.String(30)))
+              Column('id', sa.Integer, primary_key=True),
+              Column('name', sa.String(30)))
         Table('addresses', meta,
-            Column('id', sa.Integer, primary_key=True),
-            Column('street', sa.String(30)),
-            Column('user_id', sa.Integer))
+              Column('id', sa.Integer, primary_key=True),
+              Column('street', sa.String(30)),
+              Column('user_id', sa.Integer))
 
         meta.create_all()
         meta2 = MetaData(testing.db)
         a2 = Table('addresses', meta2,
-                Column('user_id', sa.Integer, sa.ForeignKey('users.id')),
-               autoload=True)
+                   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
         assert len(a2.foreign_keys) == 1
@@ -510,16 +511,16 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         u3 = Table('users', meta3, autoload=True)
 
-        a3 = Table('addresses', meta3, Column('user_id',
-                   sa.Integer, sa.ForeignKey('users.id')),
+        a3 = Table('addresses', meta3,
+                   Column('user_id', sa.Integer, sa.ForeignKey('users.id')),
                    autoload=True)
         assert u3.join(a3).onclause.compare(u3.c.id == a3.c.user_id)
 
         meta4 = MetaData(testing.db)
 
         u4 = Table('users', meta4,
-                Column('id', sa.Integer, key='u_id', primary_key=True),
-                autoload=True)
+                   Column('id', sa.Integer, key='u_id', primary_key=True),
+                   autoload=True)
 
         a4 = Table(
             'addresses',
@@ -527,10 +528,9 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
             Column('id', sa.Integer, key='street',
                    primary_key=True),
             Column('street', sa.String(30), key='user_id'),
-            Column('user_id', sa.Integer, sa.ForeignKey('users.u_id'
-                   ), key='id'),
-            autoload=True,
-            )
+            Column('user_id', sa.Integer, sa.ForeignKey('users.u_id'),
+                   key='id'),
+            autoload=True)
         assert u4.join(a4).onclause.compare(u4.c.u_id == a4.c.id)
         assert list(u4.primary_key) == [u4.c.u_id]
         assert len(u4.columns) == 2
@@ -545,17 +545,15 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         metadata = self.metadata
 
         Table('a',
-            metadata,
-            Column('x', sa.Integer, primary_key=True),
-            Column('y', sa.Integer, primary_key=True),
-        )
+              metadata,
+              Column('x', sa.Integer, primary_key=True),
+              Column('y', sa.Integer, primary_key=True))
 
         Table('b',
-            metadata,
-            Column('x', sa.Integer, primary_key=True),
-            Column('y', sa.Integer, primary_key=True),
-            sa.ForeignKeyConstraint(['x', 'y'], ['a.x', 'a.y'])
-        )
+              metadata,
+              Column('x', sa.Integer, primary_key=True),
+              Column('y', sa.Integer, primary_key=True),
+              sa.ForeignKeyConstraint(['x', 'y'], ['a.x', 'a.y']))
 
         metadata.create_all()
 
@@ -565,10 +563,9 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         c2 = Column('y', sa.Integer, primary_key=True)
         f1 = sa.ForeignKeyConstraint(['x', 'y'], ['a.x', 'a.y'])
         b1 = Table('b',
-            meta2, c1, c2, f1,
-            autoload=True,
-            autoload_with=testing.db
-        )
+                   meta2, c1, c2, f1,
+                   autoload=True,
+                   autoload_with=testing.db)
 
         assert b1.c.x is c1
         assert b1.c.y is c2
@@ -582,19 +579,17 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         meta = self.metadata
         Table('a', meta,
-            Column('x', sa.Integer, primary_key=True),
-            Column('z', sa.Integer),
-            test_needs_fk=True
-        )
+              Column('x', sa.Integer, primary_key=True),
+              Column('z', sa.Integer),
+              test_needs_fk=True)
         Table('b', meta,
-            Column('y', sa.Integer, sa.ForeignKey('a.x')),
-            test_needs_fk=True
-        )
+              Column('y', sa.Integer, sa.ForeignKey('a.x')),
+              test_needs_fk=True)
         meta.create_all()
         m2 = MetaData(testing.db)
         a2 = Table('a', m2,
-                Column('x', sa.Integer, primary_key=True, key='x1'),
-                autoload=True)
+                   Column('x', sa.Integer, primary_key=True, key='x1'),
+                   autoload=True)
         b2 = Table('b', m2, autoload=True)
         assert a2.join(b2).onclause.compare(a2.c.x1 == b2.c.y)
         assert b2.c.y.references(a2.c.x1)
@@ -609,14 +604,12 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         meta = self.metadata
         Table('a', meta,
-            Column('x', sa.Integer, primary_key=True),
-            Column('z', sa.Integer),
-            test_needs_fk=True
-        )
+              Column('x', sa.Integer, primary_key=True),
+              Column('z', sa.Integer),
+              test_needs_fk=True)
         Table('b', meta,
-            Column('y', sa.Integer, sa.ForeignKey('a.x')),
-            test_needs_fk=True
-        )
+              Column('y', sa.Integer, sa.ForeignKey('a.x')),
+              test_needs_fk=True)
         meta.create_all()
         m2 = MetaData(testing.db)
         a2 = Table('a', m2, include_columns=['z'], autoload=True)
@@ -633,19 +626,19 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         meta = self.metadata
         Table('users', meta,
-            Column('id', sa.Integer, primary_key=True),
-            Column('name', sa.String(30)),
-            test_needs_fk=True)
+              Column('id', sa.Integer, primary_key=True),
+              Column('name', sa.String(30)),
+              test_needs_fk=True)
         Table('addresses', meta,
-            Column('id', sa.Integer, primary_key=True),
-            Column('user_id', sa.Integer, sa.ForeignKey('users.id')),
-            test_needs_fk=True)
+              Column('id', sa.Integer, primary_key=True),
+              Column('user_id', sa.Integer, sa.ForeignKey('users.id')),
+              test_needs_fk=True)
 
         meta.create_all()
         meta2 = MetaData(testing.db)
         a2 = Table('addresses', meta2,
-                Column('user_id', sa.Integer, sa.ForeignKey('users.id')),
-                autoload=True)
+                   Column('user_id', sa.Integer, sa.ForeignKey('users.id')),
+                   autoload=True)
         u2 = Table('users', meta2, autoload=True)
         s = sa.select([a2])
 
@@ -661,11 +654,12 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         assert u2.join(a2).onclause.compare(u2.c.id == a2.c.user_id)
 
         meta2 = MetaData(testing.db)
-        u2 = Table('users', meta2, Column('id', sa.Integer,
-                   primary_key=True), autoload=True)
-        a2 = Table('addresses', meta2, Column('id', sa.Integer,
-                   primary_key=True), Column('user_id', sa.Integer,
-                   sa.ForeignKey('users.id')), autoload=True)
+        u2 = Table('users', meta2, Column('id', sa.Integer, primary_key=True),
+                   autoload=True)
+        a2 = Table('addresses', meta2,
+                   Column('id', sa.Integer, primary_key=True),
+                   Column('user_id', sa.Integer, sa.ForeignKey('users.id')),
+                   autoload=True)
         s = sa.select([a2])
 
         assert s.c.user_id is not None
@@ -687,7 +681,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         if testing.against('postgresql'):
             test_attrs = ('match', 'onupdate', 'ondelete',
-                            'deferrable', 'initially')
+                          'deferrable', 'initially')
             addresses_user_id_fkey = sa.ForeignKey(
                 # Each option is specifically not a Postgres default, or
                 # it won't be returned by PG's inspection
@@ -713,13 +707,13 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         meta = self.metadata
         Table('users', meta,
-            Column('id', sa.Integer, primary_key=True),
-            Column('name', sa.String(30)),
-            test_needs_fk=True)
+              Column('id', sa.Integer, primary_key=True),
+              Column('name', sa.String(30)),
+              test_needs_fk=True)
         Table('addresses', meta,
-            Column('id', sa.Integer, primary_key=True),
-            Column('user_id', sa.Integer, addresses_user_id_fkey),
-            test_needs_fk=True)
+              Column('id', sa.Integer, primary_key=True),
+              Column('user_id', sa.Integer, addresses_user_id_fkey),
+              test_needs_fk=True)
         meta.create_all()
 
         meta2 = MetaData()
@@ -754,10 +748,9 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
     def test_fk_error(self):
         metadata = MetaData(testing.db)
         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)),
-            )
+              Column('slot_id', sa.Integer, primary_key=True),
+              Column('pkg_id', sa.Integer, sa.ForeignKey('pkgs.pkg_id')),
+              Column('slot', sa.String(128)))
 
         assert_raises_message(
             sa.exc.InvalidRequestError,
@@ -805,16 +798,17 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
             test_needs_fk=True,
         )
         multi2 = Table('multi2', meta,
-            Column('id', sa.Integer, primary_key=True),
-            Column('foo', sa.Integer),
-            Column('bar', sa.Integer),
-            Column('lala', sa.Integer),
-            Column('data', sa.String(50)),
-            sa.ForeignKeyConstraint(['foo', 'bar', 'lala'],
-             ['multi.multi_id', 'multi.multi_rev', 'multi.multi_hoho'
-             ]),
-            test_needs_fk=True,
-        )
+                       Column('id', sa.Integer, primary_key=True),
+                       Column('foo', sa.Integer),
+                       Column('bar', sa.Integer),
+                       Column('lala', sa.Integer),
+                       Column('data', sa.String(50)),
+                       sa.ForeignKeyConstraint(['foo', 'bar', 'lala'],
+                                               ['multi.multi_id',
+                                                'multi.multi_rev',
+                                                'multi.multi_hoho']),
+                       test_needs_fk=True,
+                       )
         meta.create_all()
 
         meta2 = MetaData()
@@ -827,9 +821,9 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         j = sa.join(table, table2)
 
         self.assert_(sa.and_(table.c.multi_id == table2.c.foo,
-                     table.c.multi_rev == table2.c.bar,
-                     table.c.multi_hoho
-                     == table2.c.lala).compare(j.onclause))
+                             table.c.multi_rev == table2.c.bar,
+                             table.c.multi_hoho == table2.c.lala)
+                     .compare(j.onclause))
 
     @testing.crashes('oracle', 'FIXME: unknown, confirm not fails_on')
     @testing.requires.check_constraints
@@ -840,9 +834,9 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         # error
 
         meta = self.metadata
-        table_a = Table('select', meta, Column('not', sa.Integer,
-                        primary_key=True), Column('from',
-                        sa.String(12), nullable=False),
+        table_a = Table('select', meta,
+                        Column('not', sa.Integer, primary_key=True),
+                        Column('from', sa.String(12), nullable=False),
                         sa.UniqueConstraint('from', name='when'))
         sa.Index('where', table_a.c['from'])
 
@@ -856,17 +850,16 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
         quoter = meta.bind.dialect.identifier_preparer.quote_identifier
 
         Table('false', meta,
-                    Column('create', sa.Integer, primary_key=True),
-                    Column('true', sa.Integer, sa.ForeignKey('select.not')),
-                    sa.CheckConstraint('%s <> 1'
-                        % quoter(check_col), name='limit')
-                    )
+              Column('create', sa.Integer, primary_key=True),
+              Column('true', sa.Integer, sa.ForeignKey('select.not')),
+              sa.CheckConstraint('%s <> 1' % quoter(check_col), name='limit'))
 
         table_c = Table('is', meta,
-                Column('or', sa.Integer, nullable=False, primary_key=True),
-                Column('join', sa.Integer, nullable=False, primary_key=True),
-                sa.PrimaryKeyConstraint('or', 'join', name='to')
-                )
+                        Column('or', sa.Integer, nullable=False,
+                               primary_key=True),
+                        Column('join', sa.Integer, nullable=False,
+                               primary_key=True),
+                        sa.PrimaryKeyConstraint('or', 'join', name='to'))
         index_c = sa.Index('else', table_c.c.join)
         meta.create_all()
         index_c.drop()
@@ -884,7 +877,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
     @testing.uses_deprecated()
     def test_reflect_uses_bind_constructor_conn(self):
         self._test_reflect_uses_bind(lambda e: MetaData(e.connect(),
-                    reflect=True))
+                                                        reflect=True))
 
     @testing.uses_deprecated()
     def test_reflect_uses_bind_constructor_engine(self):
@@ -994,9 +987,8 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
     def test_index_reflection(self):
         m1 = self.metadata
         t1 = Table('party', m1,
-            Column('id', sa.Integer, nullable=False),
-            Column('name', sa.String(20), index=True)
-            )
+                   Column('id', sa.Integer, nullable=False),
+                   Column('name', sa.String(20), index=True))
         sa.Index('idx1', t1.c.id, unique=True)
         sa.Index('idx2', t1.c.name, t1.c.id, unique=False)
         m1.create_all()
@@ -1011,9 +1003,9 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
 
         assert r1.name == 'idx1'
         assert r2.name == 'idx2'
-        assert r1.unique == True
-        assert r2.unique == False
-        assert r3.unique == False
+        assert r1.unique == True  # noqa
+        assert r2.unique == False  # noqa
+        assert r3.unique == False  # noqa
         assert set([t2.c.id]) == set(r1.columns)
         assert set([t2.c.name, t2.c.id]) == set(r2.columns)
         assert set([t2.c.name]) == set(r3.columns)
@@ -1102,7 +1094,7 @@ class ReflectionTest(fixtures.TestBase, ComparesTables):
             eq_(
                 set(m2.tables),
                 set(['email_addresses_v', 'users_v',
-                            'users', 'dingalings', 'email_addresses'])
+                     'users', 'dingalings', 'email_addresses'])
             )
         finally:
             _drop_views(metadata.bind)
@@ -1116,36 +1108,38 @@ class CreateDropTest(fixtures.TestBase):
         global metadata, users
         metadata = MetaData()
         users = Table('users', metadata,
-                    Column('user_id', sa.Integer,
-                      sa.Sequence('user_id_seq', optional=True),
-                      primary_key=True),
-                    Column('user_name', sa.String(40)))
+                      Column('user_id', sa.Integer,
+                             sa.Sequence('user_id_seq', optional=True),
+                             primary_key=True),
+                      Column('user_name', sa.String(40)))
 
         Table('email_addresses', metadata,
-                      Column('address_id', sa.Integer,
-                          sa.Sequence('address_id_seq', optional=True),
-                          primary_key=True),
-                      Column('user_id',
-                          sa.Integer, sa.ForeignKey(users.c.user_id)),
-                      Column('email_address', sa.String(40)))
+              Column('address_id', sa.Integer,
+                     sa.Sequence('address_id_seq', optional=True),
+                     primary_key=True),
+              Column('user_id',
+                     sa.Integer, sa.ForeignKey(users.c.user_id)),
+              Column('email_address', sa.String(40)))
 
         Table(
             'orders',
             metadata,
-            Column('order_id', sa.Integer, sa.Sequence('order_id_seq',
-                   optional=True), primary_key=True),
+            Column('order_id',
+                   sa.Integer,
+                   sa.Sequence('order_id_seq', optional=True),
+                   primary_key=True),
             Column('user_id', sa.Integer,
                    sa.ForeignKey(users.c.user_id)),
             Column('description', sa.String(50)),
             Column('isopen', sa.Integer),
-            )
+        )
         Table('items', metadata,
-                        Column('item_id', sa.INT,
-                           sa.Sequence('items_id_seq', optional=True),
-                               primary_key=True),
-                        Column('order_id',
-                           sa.INT, sa.ForeignKey('orders')),
-                           Column('item_name', sa.VARCHAR(50)))
+              Column('item_id', sa.INT,
+                     sa.Sequence('items_id_seq', optional=True),
+                     primary_key=True),
+              Column('order_id',
+                     sa.INT, sa.ForeignKey('orders')),
+              Column('item_name', sa.VARCHAR(50)))
 
     def test_sorter(self):
         tables = metadata.sorted_tables
@@ -1204,8 +1198,8 @@ class SchemaManipulationTest(fixtures.TestBase):
 
         users = Table('users', meta, Column('id', sa.Integer))
         addresses = Table('addresses', meta,
-                        Column('id', sa.Integer),
-                        Column('user_id', sa.Integer))
+                          Column('id', sa.Integer),
+                          Column('user_id', sa.Integer))
 
         fk = sa.ForeignKeyConstraint(['user_id'], [users.c.id])
 
@@ -1281,11 +1275,10 @@ class UnicodeReflectionTest(fixtures.TestBase):
 
         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)
-                  )
+                      Column('id', sa.Integer,
+                             sa.Sequence(cname + '_id_seq'),
+                             primary_key=True),
+                      Column(cname, Integer))
             schema.Index(ixname, t.c[cname])
 
         metadata.create_all(testing.db)
@@ -1356,9 +1349,9 @@ class SchemaTest(fixtures.TestBase):
     @testing.requires.cross_schema_fk_reflection
     def test_has_schema(self):
         eq_(testing.db.dialect.has_schema(testing.db,
-            testing.config.test_schema), True)
+                                          testing.config.test_schema), True)
         eq_(testing.db.dialect.has_schema(testing.db,
-            'sa_fake_schema_123'), False)
+                                          'sa_fake_schema_123'), False)
 
     @testing.requires.schemas
     @testing.requires.cross_schema_fk_reflection
@@ -1404,15 +1397,15 @@ class SchemaTest(fixtures.TestBase):
 
         metadata = MetaData(engine)
         Table('table1', metadata,
-                       Column('col1', sa.Integer, primary_key=True),
-                       test_needs_fk=True,
-                       schema=schema)
+              Column('col1', sa.Integer, primary_key=True),
+              test_needs_fk=True,
+              schema=schema)
         Table('table2', metadata,
-                       Column('col1', sa.Integer, primary_key=True),
-                       Column('col2', sa.Integer,
-                              sa.ForeignKey('%s.table1.col1' % schema)),
-                       test_needs_fk=True,
-                       schema=schema)
+              Column('col1', sa.Integer, primary_key=True),
+              Column('col2', sa.Integer,
+                     sa.ForeignKey('%s.table1.col1' % schema)),
+              test_needs_fk=True,
+              schema=schema)
         try:
             metadata.create_all()
             metadata.create_all(checkfirst=True)
@@ -1428,15 +1421,18 @@ class SchemaTest(fixtures.TestBase):
     @testing.requires.schemas
     @testing.provide_metadata
     def test_schema_translation(self):
-        Table('foob', self.metadata, Column('q', Integer), schema=config.test_schema)
+        Table('foob', self.metadata, Column('q', Integer),
+              schema=config.test_schema)
         self.metadata.create_all()
 
         m = MetaData()
         map_ = {"foob": config.test_schema}
-        with config.db.connect().execution_options(schema_translate_map=map_) as conn:
+        with config.db.connect().execution_options(schema_translate_map=map_) \
+                as conn:
             t = Table('foob', m, schema="foob", autoload_with=conn)
             eq_(t.schema, "foob")
             eq_(t.c.keys(), ['q'])
+
     @testing.requires.schemas
     @testing.fails_on('sybase', 'FIXME: unknown')
     def test_explicit_default_schema_metadata(self):
@@ -1454,13 +1450,12 @@ class SchemaTest(fixtures.TestBase):
 
         metadata = MetaData(engine, schema=schema)
         Table('table1', metadata,
-                       Column('col1', sa.Integer, primary_key=True),
-                       test_needs_fk=True)
+              Column('col1', sa.Integer, primary_key=True),
+              test_needs_fk=True)
         Table('table2', metadata,
-                       Column('col1', sa.Integer, primary_key=True),
-                       Column('col2', sa.Integer,
-                              sa.ForeignKey('table1.col1')),
-                       test_needs_fk=True)
+              Column('col1', sa.Integer, primary_key=True),
+              Column('col2', sa.Integer, sa.ForeignKey('table1.col1')),
+              test_needs_fk=True)
         try:
             metadata.create_all()
             metadata.create_all(checkfirst=True)
@@ -1487,7 +1482,7 @@ class SchemaTest(fixtures.TestBase):
                 '%s.dingalings' % testing.config.test_schema,
                 '%s.users' % testing.config.test_schema,
                 '%s.email_addresses' % testing.config.test_schema
-                ])
+            ])
         )
 
     @testing.requires.schemas
@@ -1495,12 +1490,11 @@ class SchemaTest(fixtures.TestBase):
     @testing.provide_metadata
     def test_reflect_all_schemas_default_overlap(self):
         t1 = Table('t', self.metadata,
-                Column('id', Integer, primary_key=True))
+                   Column('id', Integer, primary_key=True))
 
         t2 = Table('t', self.metadata,
-            Column('id1', sa.ForeignKey('t.id')),
-            schema=testing.config.test_schema
-        )
+                   Column('id1', sa.ForeignKey('t.id')),
+                   schema=testing.config.test_schema)
 
         self.metadata.create_all()
         m2 = MetaData()
@@ -1526,42 +1520,41 @@ def createTables(meta, schema=None):
         schema_prefix = ""
 
     users = Table('users', meta,
-        Column('user_id', sa.INT, primary_key=True),
-        Column('user_name', sa.VARCHAR(20), nullable=False),
-        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('test5', sa.Date),
-        Column('test5_1', sa.TIMESTAMP),
-        Column('parent_user_id', sa.Integer,
-                    sa.ForeignKey('%susers.user_id' % schema_prefix)),
-        Column('test6', sa.Date, nullable=False),
-        Column('test7', sa.Text),
-        Column('test8', sa.LargeBinary),
-        Column('test_passivedefault2', sa.Integer, server_default='5'),
-        Column('test9', sa.LargeBinary(100)),
-        Column('test10', sa.Numeric(10, 2)),
-        schema=schema,
-        test_needs_fk=True,
-    )
+                  Column('user_id', sa.INT, primary_key=True),
+                  Column('user_name', sa.VARCHAR(20), nullable=False),
+                  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('test5', sa.Date),
+                  Column('test5_1', sa.TIMESTAMP),
+                  Column('parent_user_id', sa.Integer,
+                         sa.ForeignKey('%susers.user_id' % schema_prefix)),
+                  Column('test6', sa.Date, nullable=False),
+                  Column('test7', sa.Text),
+                  Column('test8', sa.LargeBinary),
+                  Column('test_passivedefault2', sa.Integer,
+                         server_default='5'),
+                  Column('test9', sa.LargeBinary(100)),
+                  Column('test10', sa.Numeric(10, 2)),
+                  schema=schema,
+                  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,
-               sa.ForeignKey(users.c.user_id)),
-        Column('email_address', sa.String(20)),
-        sa.PrimaryKeyConstraint('address_id', name='email_ad_pk'),
-        schema=schema,
-        test_needs_fk=True,
-    )
+                      Column('address_id', sa.Integer),
+                      Column('remote_user_id', sa.Integer,
+                             sa.ForeignKey(users.c.user_id)),
+                      Column('email_address', sa.String(20)),
+                      sa.PrimaryKeyConstraint('address_id',
+                                              name='email_ad_pk'),
+                      schema=schema,
+                      test_needs_fk=True)
 
     return (users, addresses, dingalings)
 
@@ -1631,14 +1624,12 @@ class CaseSensitiveTest(fixtures.TablesTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('SomeTable', metadata,
-            Column('x', Integer, primary_key=True),
-            test_needs_fk=True
-        )
+              Column('x', Integer, primary_key=True),
+              test_needs_fk=True)
         Table('SomeOtherTable', metadata,
-            Column('x', Integer, primary_key=True),
-            Column('y', Integer, sa.ForeignKey("SomeTable.x")),
-            test_needs_fk=True
-        )
+              Column('x', Integer, primary_key=True),
+              Column('y', Integer, sa.ForeignKey("SomeTable.x")),
+              test_needs_fk=True)
 
     @testing.fails_if(testing.requires._has_mysql_on_windows)
     def test_table_names(self):
@@ -1654,13 +1645,13 @@ class CaseSensitiveTest(fixtures.TablesTest):
         assert t1.c.x is not None
 
     @testing.fails_if(lambda:
-            testing.against(('mysql', '<', (5, 5))) and
-            not testing.requires._has_mysql_fully_case_sensitive()
-            )
+                      testing.against(('mysql', '<', (5, 5))) and
+                      not testing.requires._has_mysql_fully_case_sensitive()
+                      )
     def test_reflect_via_fk(self):
         m = MetaData()
         t2 = Table("SomeOtherTable", m, autoload=True,
-                    autoload_with=testing.db)
+                   autoload_with=testing.db)
         eq_(t2.name, "SomeOtherTable")
         assert "SomeTable" in m.tables
 
@@ -1752,9 +1743,8 @@ class ColumnEventsTest(fixtures.RemovesEvents, fixtures.TestBase):
         to_reflect = Table("to_reflect", m, autoload=True, listeners=[
             ('column_reflect', column_reflect),
         ])
-        related = Table("related", m, autoload=True, listeners=[
-            ('column_reflect', column_reflect),
-            ])
+        related = Table("related", m, autoload=True,
+                        listeners=[('column_reflect', column_reflect)])
 
         assert related.c.qyz.references(to_reflect.c.xyz)
 
diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index 7e95fb4fa..d865b47a5 100644
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -22,10 +22,9 @@ class TransactionTest(fixtures.TestBase):
         global users, metadata
         metadata = MetaData()
         users = Table('query_users', metadata,
-            Column('user_id', INT, primary_key=True),
-            Column('user_name', VARCHAR(20)),
-            test_needs_acid=True,
-        )
+                      Column('user_id', INT, primary_key=True),
+                      Column('user_name', VARCHAR(20)),
+                      test_needs_acid=True)
         users.create(testing.db)
 
     def teardown(self):
@@ -92,13 +91,11 @@ class TransactionTest(fixtures.TestBase):
 
         testing.db.transaction(go, users, [dict(user_id=1,
                                user_name='user1')])
-        eq_(testing.db.execute(users.select()).fetchall(), [(1, 'user1'
-            )])
+        eq_(testing.db.execute(users.select()).fetchall(), [(1, 'user1')])
         assert_raises(exc.DBAPIError, testing.db.transaction, go,
                       users, [{'user_id': 2, 'user_name': 'user2'},
-                      {'user_id': 1, 'user_name': 'user3'}])
-        eq_(testing.db.execute(users.select()).fetchall(), [(1, 'user1'
-            )])
+                              {'user_id': 1, 'user_name': 'user3'}])
+        eq_(testing.db.execute(users.select()).fetchall(), [(1, 'user1')])
 
     def test_nested_rollback(self):
         connection = testing.db.connect()
@@ -114,12 +111,12 @@ class TransactionTest(fixtures.TestBase):
                 trans2 = connection.begin()
                 try:
                     connection.execute(users.insert(), user_id=4,
-                            user_name='user4')
+                                       user_name='user4')
                     connection.execute(users.insert(), user_id=5,
-                            user_name='user5')
+                                       user_name='user5')
                     raise Exception('uh oh')
                     trans2.commit()
-                except:
+                except Exception:
                     trans2.rollback()
                     raise
                 transaction.rollback()
@@ -128,8 +125,9 @@ class TransactionTest(fixtures.TestBase):
                 raise
         except Exception as e:
             try:
-                assert str(e) == 'uh oh'  # and not "This transaction is
-                                          # inactive"
+                # and not "This transaction is inactive"
+                # comment moved here to fix pep8
+                assert str(e) == 'uh oh'
             finally:
                 connection.close()
 
@@ -263,7 +261,7 @@ class TransactionTest(fixtures.TestBase):
         trans2.commit()
         transaction.rollback()
         self.assert_(connection.scalar('select count(*) from '
-                     'query_users') == 0)
+                                       'query_users') == 0)
         result = connection.execute('select * from query_users')
         assert len(result.fetchall()) == 0
         connection.close()
@@ -280,14 +278,14 @@ class TransactionTest(fixtures.TestBase):
 
         assert not trans.is_active
         self.assert_(connection.scalar('select count(*) from '
-                     'query_users') == 0)
+                                       'query_users') == 0)
 
         trans = connection.begin()
         connection.execute(users.insert(), user_id=1, user_name='user1')
         trans.__exit__(None, None, None)
         assert not trans.is_active
         self.assert_(connection.scalar('select count(*) from '
-                     'query_users') == 1)
+                                       'query_users') == 1)
         connection.close()
 
     def test_close(self):
@@ -305,7 +303,7 @@ class TransactionTest(fixtures.TestBase):
         transaction.commit()
         assert not connection.in_transaction()
         self.assert_(connection.scalar('select count(*) from '
-                     'query_users') == 5)
+                                       'query_users') == 5)
         result = connection.execute('select * from query_users')
         assert len(result.fetchall()) == 5
         connection.close()
@@ -325,7 +323,7 @@ class TransactionTest(fixtures.TestBase):
         transaction.close()
         assert not connection.in_transaction()
         self.assert_(connection.scalar('select count(*) from '
-                     'query_users') == 0)
+                                       'query_users') == 0)
         result = connection.execute('select * from query_users')
         assert len(result.fetchall()) == 0
         connection.close()
@@ -341,7 +339,7 @@ class TransactionTest(fixtures.TestBase):
         connection.execute(users.insert(), user_id=3, user_name='user3')
         transaction.commit()
         eq_(connection.execute(select([users.c.user_id]).
-            order_by(users.c.user_id)).fetchall(),
+                               order_by(users.c.user_id)).fetchall(),
             [(1, ), (3, )])
         connection.close()
 
@@ -359,7 +357,7 @@ class TransactionTest(fixtures.TestBase):
         connection.execute(users.insert(), user_id=3, user_name='user3')
         transaction.commit()
         eq_(connection.execute(select([users.c.user_id]).
-            order_by(users.c.user_id)).fetchall(),
+                               order_by(users.c.user_id)).fetchall(),
             [(1, ), (2, ), (3, )])
         connection.close()
 
@@ -376,7 +374,7 @@ class TransactionTest(fixtures.TestBase):
         connection.execute(users.insert(), user_id=4, user_name='user4')
         transaction.commit()
         eq_(connection.execute(select([users.c.user_id]).
-            order_by(users.c.user_id)).fetchall(),
+                               order_by(users.c.user_id)).fetchall(),
             [(1, ), (4, )])
         connection.close()
 
@@ -400,7 +398,7 @@ class TransactionTest(fixtures.TestBase):
         transaction.rollback()
         transaction.close()
         eq_(connection.execute(select([users.c.user_id]).
-            order_by(users.c.user_id)).fetchall(),
+                               order_by(users.c.user_id)).fetchall(),
             [(1, ), (2, )])
         connection.close()
 
@@ -431,7 +429,7 @@ class TransactionTest(fixtures.TestBase):
         transaction.prepare()
         transaction.commit()
         eq_(connection.execute(select([users.c.user_id]).
-            order_by(users.c.user_id)).fetchall(),
+                               order_by(users.c.user_id)).fetchall(),
             [(1, ), (2, ), (5, )])
         connection.close()
 
@@ -454,12 +452,12 @@ class TransactionTest(fixtures.TestBase):
         eq_(
             connection2.execution_options(autocommit=True).
             execute(select([users.c.user_id]).
-            order_by(users.c.user_id)).fetchall(), [])
+                    order_by(users.c.user_id)).fetchall(), [])
         recoverables = connection2.recover_twophase()
         assert transaction.xid in recoverables
         connection2.commit_prepared(transaction.xid, recover=True)
         eq_(connection2.execute(select([users.c.user_id]).
-            order_by(users.c.user_id)).fetchall(),
+                                order_by(users.c.user_id)).fetchall(),
             [(1, )])
         connection2.close()
 
@@ -483,7 +481,7 @@ class TransactionTest(fixtures.TestBase):
         xa.commit()
         result = \
             conn.execute(select([users.c.user_name]).
-                order_by(users.c.user_id))
+                         order_by(users.c.user_id))
         eq_(result.fetchall(), [('user1', ), ('user4', )])
         conn.close()
 
@@ -515,7 +513,7 @@ class TransactionTest(fixtures.TestBase):
         with eng.connect() as conn:
             result = \
                 conn.execute(select([users.c.user_name]).
-                    order_by(users.c.user_id))
+                             order_by(users.c.user_id))
             eq_(result.fetchall(), [])
 
 
@@ -641,9 +639,10 @@ class AutoRollbackTest(fixtures.TestBase):
 
         conn1 = testing.db.connect()
         conn2 = testing.db.connect()
-        users = Table('deadlock_users', metadata, Column('user_id',
-                      INT, primary_key=True), Column('user_name',
-                      VARCHAR(20)), test_needs_acid=True)
+        users = Table('deadlock_users', metadata,
+                      Column('user_id', INT, primary_key=True),
+                      Column('user_name', VARCHAR(20)),
+                      test_needs_acid=True)
         users.create(conn1)
         conn1.execute('select * from deadlock_users')
         conn1.close()
@@ -670,8 +669,9 @@ class ExplicitAutoCommitTest(fixtures.TestBase):
     def setup_class(cls):
         global metadata, foo
         metadata = MetaData(testing.db)
-        foo = Table('foo', metadata, Column('id', Integer,
-                    primary_key=True), Column('data', String(100)))
+        foo = Table('foo', metadata,
+                    Column('id', Integer, primary_key=True),
+                    Column('data', String(100)))
         metadata.create_all()
         testing.db.execute("create function insert_foo(varchar) "
                            "returns integer as 'insert into foo(data) "
@@ -705,8 +705,8 @@ class ExplicitAutoCommitTest(fixtures.TestBase):
     def test_explicit_compiled(self):
         conn1 = testing.db.connect()
         conn2 = testing.db.connect()
-        conn1.execute(select([func.insert_foo('data1'
-                      )]).execution_options(autocommit=True))
+        conn1.execute(select([func.insert_foo('data1')])
+                      .execution_options(autocommit=True))
         assert conn2.execute(select([foo.c.data])).fetchall() \
             == [('data1', )]
         conn1.close()
@@ -716,34 +716,31 @@ class ExplicitAutoCommitTest(fixtures.TestBase):
         conn1 = testing.db.connect()
         conn2 = testing.db.connect()
         conn1.execution_options(autocommit=True).\
-            execute(select([func.insert_foo('data1'
-                )]))
-        eq_(conn2.execute(select([foo.c.data])).fetchall(), [('data1',
-            )])
+            execute(select([func.insert_foo('data1')]))
+        eq_(conn2.execute(select([foo.c.data])).fetchall(), [('data1',)])
 
         # connection supersedes statement
 
         conn1.execution_options(autocommit=False).\
-            execute(select([func.insert_foo('data2'
-                )]).execution_options(autocommit=True))
-        eq_(conn2.execute(select([foo.c.data])).fetchall(), [('data1',
-            )])
+            execute(select([func.insert_foo('data2')])
+                    .execution_options(autocommit=True))
+        eq_(conn2.execute(select([foo.c.data])).fetchall(), [('data1',)])
 
         # ditto
 
         conn1.execution_options(autocommit=True).\
-            execute(select([func.insert_foo('data3'
-                )]).execution_options(autocommit=False))
-        eq_(conn2.execute(select([foo.c.data])).fetchall(), [('data1',
-            ), ('data2', ), ('data3', )])
+            execute(select([func.insert_foo('data3')])
+                    .execution_options(autocommit=False))
+        eq_(conn2.execute(select([foo.c.data])).fetchall(),
+            [('data1',), ('data2', ), ('data3', )])
         conn1.close()
         conn2.close()
 
     def test_explicit_text(self):
         conn1 = testing.db.connect()
         conn2 = testing.db.connect()
-        conn1.execute(text("select insert_foo('moredata')"
-                      ).execution_options(autocommit=True))
+        conn1.execute(text("select insert_foo('moredata')")
+                      .execution_options(autocommit=True))
         assert conn2.execute(select([foo.c.data])).fetchall() \
             == [('moredata', )]
         conn1.close()
@@ -754,8 +751,7 @@ class ExplicitAutoCommitTest(fixtures.TestBase):
     def test_explicit_compiled_deprecated(self):
         conn1 = testing.db.connect()
         conn2 = testing.db.connect()
-        conn1.execute(select([func.insert_foo('data1')],
-                      autocommit=True))
+        conn1.execute(select([func.insert_foo('data1')], autocommit=True))
         assert conn2.execute(select([foo.c.data])).fetchall() \
             == [('data1', )]
         conn1.execute(select([func.insert_foo('data2')]).autocommit())
@@ -768,8 +764,7 @@ class ExplicitAutoCommitTest(fixtures.TestBase):
     def test_explicit_text_deprecated(self):
         conn1 = testing.db.connect()
         conn2 = testing.db.connect()
-        conn1.execute(text("select insert_foo('moredata')",
-                      autocommit=True))
+        conn1.execute(text("select insert_foo('moredata')", autocommit=True))
         assert conn2.execute(select([foo.c.data])).fetchall() \
             == [('moredata', )]
         conn1.close()
@@ -778,8 +773,7 @@ class ExplicitAutoCommitTest(fixtures.TestBase):
     def test_implicit_text(self):
         conn1 = testing.db.connect()
         conn2 = testing.db.connect()
-        conn1.execute(text("insert into foo (data) values "
-                      "('implicitdata')"))
+        conn1.execute(text("insert into foo (data) values ('implicitdata')"))
         assert conn2.execute(select([foo.c.data])).fetchall() \
             == [('implicitdata', )]
         conn1.close()
@@ -798,10 +792,12 @@ class TLTransactionTest(fixtures.TestBase):
         global users, metadata, tlengine
         tlengine = testing_engine(options=dict(strategy='threadlocal'))
         metadata = MetaData()
-        users = Table('query_users', metadata, Column('user_id', INT,
-                      Sequence('query_users_id_seq', optional=True),
-                      primary_key=True), Column('user_name',
-                      VARCHAR(20)), test_needs_acid=True)
+        users = Table('query_users', metadata,
+                      Column('user_id',
+                             INT,
+                             Sequence('query_users_id_seq', optional=True),
+                             primary_key=True),
+                      Column('user_name', VARCHAR(20)), test_needs_acid=True)
         metadata.create_all(tlengine)
 
     def teardown(self):
@@ -819,7 +815,8 @@ class TLTransactionTest(fixtures.TestBase):
 
         tlengine.close()
 
-    @testing.crashes('oracle', 'TNS error of unknown origin occurs on the buildbot.')
+    @testing.crashes('oracle',
+                     'TNS error of unknown origin occurs on the buildbot.')
     def test_rollback_no_trans(self):
         tlengine = testing_engine(options=dict(strategy="threadlocal"))
 
@@ -879,8 +876,7 @@ class TLTransactionTest(fixtures.TestBase):
         assert len(result.fetchall()) == 4
         t.close()
         external_connection = tlengine.connect()
-        result = external_connection.execute('select * from query_users'
-                )
+        result = external_connection.execute('select * from query_users')
         try:
             assert len(result.fetchall()) == 0
         finally:
@@ -896,8 +892,7 @@ class TLTransactionTest(fixtures.TestBase):
         tlengine.execute(users.insert(), user_id=3, user_name='user3')
         tlengine.rollback()
         external_connection = tlengine.connect()
-        result = external_connection.execute('select * from query_users'
-                )
+        result = external_connection.execute('select * from query_users')
         try:
             assert len(result.fetchall()) == 0
         finally:
@@ -912,8 +907,7 @@ class TLTransactionTest(fixtures.TestBase):
         tlengine.execute(users.insert(), user_id=3, user_name='user3')
         tlengine.commit()
         external_connection = tlengine.connect()
-        result = external_connection.execute('select * from query_users'
-                )
+        result = external_connection.execute('select * from query_users')
         try:
             assert len(result.fetchall()) == 3
         finally:
@@ -932,7 +926,8 @@ class TLTransactionTest(fixtures.TestBase):
         tlengine.execute(users.insert(), user_id=4, user_name='user4')
         trans.__exit__(None, None, None)
         eq_(
-            tlengine.execute(users.select().order_by(users.c.user_id)).fetchall(),
+            tlengine.execute(users.select().order_by(users.c.user_id))
+                    .fetchall(),
             [
                 (1, 'user1'),
                 (2, 'user2'),
@@ -955,8 +950,8 @@ class TLTransactionTest(fixtures.TestBase):
         transaction.commit()
         transaction = connection.begin()
         result = connection.execute('select * from query_users')
-        l = result.fetchall()
-        assert len(l) == 3, 'expected 3 got %d' % len(l)
+        rows = result.fetchall()
+        assert len(rows) == 3, 'expected 3 got %d' % len(rows)
         transaction.commit()
         connection.close()
 
@@ -972,8 +967,7 @@ class TLTransactionTest(fixtures.TestBase):
         conn.execute(users.insert(), user_id=3, user_name='user3')
         trans.rollback()
         external_connection = tlengine.connect()
-        result = external_connection.execute('select * from query_users'
-                )
+        result = external_connection.execute('select * from query_users')
         try:
             assert len(result.fetchall()) == 0
         finally:
@@ -993,8 +987,7 @@ class TLTransactionTest(fixtures.TestBase):
         conn.execute(users.insert(), user_id=3, user_name='user3')
         trans.rollback()
         external_connection = tlengine.connect()
-        result = external_connection.execute('select * from query_users'
-                )
+        result = external_connection.execute('select * from query_users')
         try:
             assert len(result.fetchall()) == 0
         finally:
@@ -1010,8 +1003,7 @@ class TLTransactionTest(fixtures.TestBase):
         conn.execute(users.insert(), user_id=3, user_name='user3')
         trans.commit()
         external_connection = tlengine.connect()
-        result = external_connection.execute('select * from query_users'
-                )
+        result = external_connection.execute('select * from query_users')
         try:
             assert len(result.fetchall()) == 3
         finally:
@@ -1035,8 +1027,7 @@ class TLTransactionTest(fixtures.TestBase):
         tlengine.rollback()
         try:
             self.assert_(external_connection.scalar(
-                        'select count(*) from query_users'
-                         ) == 0)
+                'select count(*) from query_users') == 0)
         finally:
             external_connection.close()
 
@@ -1057,8 +1048,7 @@ class TLTransactionTest(fixtures.TestBase):
         tlengine.commit()
         try:
             self.assert_(external_connection.scalar(
-                        'select count(*) from query_users'
-                         ) == 5)
+                'select count(*) from query_users') == 5)
         finally:
             external_connection.close()
 
@@ -1089,8 +1079,7 @@ class TLTransactionTest(fixtures.TestBase):
         conn.close()
         try:
             self.assert_(external_connection.scalar(
-                        'select count(*) from query_users'
-                         ) == 0)
+                'select count(*) from query_users') == 0)
         finally:
             external_connection.close()
 
@@ -1116,8 +1105,7 @@ class TLTransactionTest(fixtures.TestBase):
         connection.close()
         try:
             self.assert_(external_connection.scalar(
-                        'select count(*) from query_users'
-                         ) == 0)
+                'select count(*) from query_users') == 0)
         finally:
             external_connection.close()
 
@@ -1132,7 +1120,7 @@ class TLTransactionTest(fixtures.TestBase):
         tlengine.commit()
         tlengine.close()
         eq_(tlengine.execute(select([users.c.user_id]).
-            order_by(users.c.user_id)).fetchall(),
+                             order_by(users.c.user_id)).fetchall(),
             [(1, ), (3, )])
         tlengine.close()
 
@@ -1150,7 +1138,7 @@ class TLTransactionTest(fixtures.TestBase):
         tlengine.commit()
         tlengine.close()
         eq_(tlengine.execute(select([users.c.user_id]).
-            order_by(users.c.user_id)).fetchall(),
+                             order_by(users.c.user_id)).fetchall(),
             [(1, ), (2, ), (3, )])
         tlengine.close()
 
@@ -1168,7 +1156,7 @@ class TLTransactionTest(fixtures.TestBase):
         tlengine.commit()
         tlengine.close()
         eq_(tlengine.execute(select([users.c.user_id]).
-            order_by(users.c.user_id)).fetchall(),
+                             order_by(users.c.user_id)).fetchall(),
             [(1, ), (4, )])
         tlengine.close()
 
@@ -1206,7 +1194,8 @@ class TLTransactionTest(fixtures.TestBase):
         assert r2.connection.closed
         assert tlengine.closed
 
-    @testing.crashes('oracle+cx_oracle', 'intermittent failures on the buildbot')
+    @testing.crashes('oracle+cx_oracle',
+                     'intermittent failures on the buildbot')
     def test_dispose(self):
         eng = testing_engine(options=dict(strategy='threadlocal'))
         result = eng.execute(select([1]))
@@ -1230,7 +1219,7 @@ class TLTransactionTest(fixtures.TestBase):
         tlengine.prepare()
         tlengine.rollback()
         eq_(tlengine.execute(select([users.c.user_id]).
-            order_by(users.c.user_id)).fetchall(),
+                             order_by(users.c.user_id)).fetchall(),
             [(1, ), (2, )])
 
 
@@ -1403,10 +1392,10 @@ class IsolationLevelTest(fixtures.TestBase):
         eng = testing_engine()
         c1 = eng.connect()
         with expect_warnings(
-            "Connection is already established with a Transaction; "
-            "setting isolation_level may implicitly rollback or commit "
-            "the existing transaction, or have no effect until next "
-            "transaction"
+                "Connection is already established with a Transaction; "
+                "setting isolation_level may implicitly rollback or commit "
+                "the existing transaction, or have no effect until next "
+                "transaction"
         ):
             with c1.begin():
                 c1 = c1.execution_options(
@@ -1440,7 +1429,7 @@ class IsolationLevelTest(fixtures.TestBase):
             testing.db.url,
             execution_options={
                 'isolation_level':
-                    self._non_default_isolation_level()}
+                self._non_default_isolation_level()}
         )
         conn = eng.connect()
         eq_(