flake8 some tests

1 files changed, 84 insertions, 56 deletions

diff --git a/test/ext/test_mutable.py b/test/ext/test_mutable.py
index f2d0123bd..bb22f0bc2 100644
--- a/test/ext/test_mutable.py
+++ b/test/ext/test_mutable.py
@@ -20,6 +20,7 @@ class SubFoo(Foo):
 
 
 class FooWithEq(object):
+
     def __init__(self, **kw):
         for k in kw:
             setattr(self, k, kw[k])
@@ -32,6 +33,7 @@ class FooWithEq(object):
 
 
 class Point(MutableComposite):
+
     def __init__(self, x, y):
         self.x = x
         self.y = y
@@ -56,6 +58,7 @@ class Point(MutableComposite):
 
 
 class MyPoint(Point):
+
     @classmethod
     def coerce(cls, key, value):
         if isinstance(value, tuple):
@@ -208,24 +211,29 @@ class _MutableDictTestBase(object):
 
         eq_(f1.non_mutable_data, {'a': 'b'})
 
+
 class MutableWithScalarPickleTest(_MutableDictTestBase, fixtures.MappedTest):
+
     @classmethod
     def define_tables(cls, metadata):
         MutableDict = cls._type_fixture()
 
         mutable_pickle = MutableDict.as_mutable(PickleType)
         Table('foo', metadata,
-            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
-            Column('skip', mutable_pickle),
-            Column('data', mutable_pickle),
-            Column('non_mutable_data', PickleType),
-            Column('unrelated_data', String(50))
-        )
+              Column('id', Integer, primary_key=True,
+                     test_needs_autoincrement=True),
+              Column('skip', mutable_pickle),
+              Column('data', mutable_pickle),
+              Column('non_mutable_data', PickleType),
+              Column('unrelated_data', String(50))
+              )
 
     def test_non_mutable(self):
         self._test_non_mutable()
 
+
 class MutableWithScalarJSONTest(_MutableDictTestBase, fixtures.MappedTest):
+
     @classmethod
     def define_tables(cls, metadata):
         import json
@@ -247,29 +255,34 @@ class MutableWithScalarJSONTest(_MutableDictTestBase, fixtures.MappedTest):
         MutableDict = cls._type_fixture()
 
         Table('foo', metadata,
-            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
-            Column('data', MutableDict.as_mutable(JSONEncodedDict)),
-            Column('non_mutable_data', JSONEncodedDict),
-            Column('unrelated_data', String(50))
-        )
+              Column('id', Integer, primary_key=True,
+                     test_needs_autoincrement=True),
+              Column('data', MutableDict.as_mutable(JSONEncodedDict)),
+              Column('non_mutable_data', JSONEncodedDict),
+              Column('unrelated_data', String(50))
+              )
 
     def test_non_mutable(self):
         self._test_non_mutable()
 
-class MutableAssocWithAttrInheritTest(_MutableDictTestBase, fixtures.MappedTest):
+
+class MutableAssocWithAttrInheritTest(_MutableDictTestBase,
+                                      fixtures.MappedTest):
+
     @classmethod
     def define_tables(cls, metadata):
 
         Table('foo', metadata,
-            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
-            Column('data', PickleType),
-            Column('non_mutable_data', PickleType),
-            Column('unrelated_data', String(50))
-        )
+              Column('id', Integer, primary_key=True,
+                     test_needs_autoincrement=True),
+              Column('data', PickleType),
+              Column('non_mutable_data', PickleType),
+              Column('unrelated_data', String(50))
+              )
 
         Table('subfoo', metadata,
-            Column('id', Integer, ForeignKey('foo.id'), primary_key=True),
-        )
+              Column('id', Integer, ForeignKey('foo.id'), primary_key=True),
+              )
 
     def setup_mappers(cls):
         foo = cls.tables.foo
@@ -301,20 +314,27 @@ class MutableAssocWithAttrInheritTest(_MutableDictTestBase, fixtures.MappedTest)
         sess.commit()
         eq_(f1.data, {'b': 'c'})
 
-class MutableAssociationScalarPickleTest(_MutableDictTestBase, fixtures.MappedTest):
+
+class MutableAssociationScalarPickleTest(_MutableDictTestBase,
+                                         fixtures.MappedTest):
+
     @classmethod
     def define_tables(cls, metadata):
         MutableDict = cls._type_fixture()
         MutableDict.associate_with(PickleType)
 
         Table('foo', metadata,
-            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
-            Column('skip', PickleType),
-            Column('data', PickleType),
-            Column('unrelated_data', String(50))
-        )
+              Column('id', Integer, primary_key=True,
+                     test_needs_autoincrement=True),
+              Column('skip', PickleType),
+              Column('data', PickleType),
+              Column('unrelated_data', String(50))
+              )
+
+
+class MutableAssociationScalarJSONTest(_MutableDictTestBase,
+                                       fixtures.MappedTest):
 
-class MutableAssociationScalarJSONTest(_MutableDictTestBase, fixtures.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         import json
@@ -337,21 +357,24 @@ class MutableAssociationScalarJSONTest(_MutableDictTestBase, fixtures.MappedTest
         MutableDict.associate_with(JSONEncodedDict)
 
         Table('foo', metadata,
-            Column('id', Integer, primary_key=True,
-                            test_needs_autoincrement=True),
-            Column('data', JSONEncodedDict),
-            Column('unrelated_data', String(50))
-        )
+              Column('id', Integer, primary_key=True,
+                     test_needs_autoincrement=True),
+              Column('data', JSONEncodedDict),
+              Column('unrelated_data', String(50))
+              )
 
 
-class CustomMutableAssociationScalarJSONTest(_MutableDictTestBase, fixtures.MappedTest):
+class CustomMutableAssociationScalarJSONTest(_MutableDictTestBase,
+                                             fixtures.MappedTest):
 
     CustomMutableDict = None
 
     @classmethod
     def _type_fixture(cls):
         if not(getattr(cls, 'CustomMutableDict')):
-            MutableDict = super(CustomMutableAssociationScalarJSONTest, cls)._type_fixture()
+            MutableDict = super(
+                CustomMutableAssociationScalarJSONTest, cls)._type_fixture()
+
             class CustomMutableDict(MutableDict):
                 pass
             cls.CustomMutableDict = CustomMutableDict
@@ -379,14 +402,15 @@ class CustomMutableAssociationScalarJSONTest(_MutableDictTestBase, fixtures.Mapp
         CustomMutableDict.associate_with(JSONEncodedDict)
 
         Table('foo', metadata,
-            Column('id', Integer, primary_key=True,
-                            test_needs_autoincrement=True),
-            Column('data', JSONEncodedDict),
-            Column('unrelated_data', String(50))
-        )
+              Column('id', Integer, primary_key=True,
+                     test_needs_autoincrement=True),
+              Column('data', JSONEncodedDict),
+              Column('unrelated_data', String(50))
+              )
 
     def test_pickle_parent(self):
-        # Picklers don't know how to pickle CustomMutableDict, but we aren't testing that here
+        # Picklers don't know how to pickle CustomMutableDict,
+        # but we aren't testing that here
         pass
 
     def test_coerce(self):
@@ -398,22 +422,22 @@ class CustomMutableAssociationScalarJSONTest(_MutableDictTestBase, fixtures.Mapp
 
 
 class _CompositeTestBase(object):
+
     @classmethod
     def define_tables(cls, metadata):
         Table('foo', metadata,
-            Column('id', Integer, primary_key=True,
-                            test_needs_autoincrement=True),
-            Column('x', Integer),
-            Column('y', Integer),
-            Column('unrelated_data', String(50))
-        )
+              Column('id', Integer, primary_key=True,
+                     test_needs_autoincrement=True),
+              Column('x', Integer),
+              Column('y', Integer),
+              Column('unrelated_data', String(50))
+              )
 
     def setup(self):
         from sqlalchemy.ext import mutable
         mutable._setup_composite_listener()
         super(_CompositeTestBase, self).setup()
 
-
     def teardown(self):
         # clear out mapper events
         Mapper.dispatch._clear()
@@ -423,9 +447,9 @@ class _CompositeTestBase(object):
     @classmethod
     def _type_fixture(cls):
 
-
         return Point
 
+
 class MutableCompositesUnpickleTest(_CompositeTestBase, fixtures.MappedTest):
 
     @classmethod
@@ -443,6 +467,7 @@ class MutableCompositesUnpickleTest(_CompositeTestBase, fixtures.MappedTest):
         for loads, dumps in picklers():
             loads(dumps(u1))
 
+
 class MutableCompositesTest(_CompositeTestBase, fixtures.MappedTest):
 
     @classmethod
@@ -516,6 +541,7 @@ class MutableCompositesTest(_CompositeTestBase, fixtures.MappedTest):
 
         eq_(f1.data.x, 5)
 
+
 class MutableCompositeCallableTest(_CompositeTestBase, fixtures.MappedTest):
 
     @classmethod
@@ -542,13 +568,14 @@ class MutableCompositeCallableTest(_CompositeTestBase, fixtures.MappedTest):
         eq_(f1.data.x, 3)
 
 
-class MutableCompositeCustomCoerceTest(_CompositeTestBase, fixtures.MappedTest):
+class MutableCompositeCustomCoerceTest(_CompositeTestBase,
+                                       fixtures.MappedTest):
+
     @classmethod
     def _type_fixture(cls):
 
         return MyPoint
 
-
     @classmethod
     def setup_mappers(cls):
         foo = cls.tables.foo
@@ -576,16 +603,18 @@ class MutableCompositeCustomCoerceTest(_CompositeTestBase, fixtures.MappedTest):
 
 
 class MutableInheritedCompositesTest(_CompositeTestBase, fixtures.MappedTest):
+
     @classmethod
     def define_tables(cls, metadata):
         Table('foo', metadata,
-            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
-            Column('x', Integer),
-            Column('y', Integer)
-        )
+              Column('id', Integer, primary_key=True,
+                     test_needs_autoincrement=True),
+              Column('x', Integer),
+              Column('y', Integer)
+              )
         Table('subfoo', metadata,
-            Column('id', Integer, ForeignKey('foo.id'), primary_key=True),
-        )
+              Column('id', Integer, ForeignKey('foo.id'), primary_key=True),
+              )
 
     @classmethod
     def setup_mappers(cls):
@@ -628,4 +657,3 @@ class MutableInheritedCompositesTest(_CompositeTestBase, fixtures.MappedTest):
             sess.add(f2)
             f2.data.y = 12
             assert f2 in sess.dirty
-