Make all tests to be PEP8 compliant

tested using pycodestyle version 2.2.0

Fixes: #3885
Change-Id: I5df43adc3aefe318f9eeab72a078247a548ec566
Pull-request: zzzeek#343

.gitignore

@@ -20,3 +20,4 @@ sqlnet.log
 /mapping_setup.py
 /test.py
 /.cache/
+*.sw[o,p]

test/aaa_profiling/test_memusage.py

@@ -368,8 +368,8 @@ def go():
             # execute with a non-unicode object. a warning is emitted,
             # this warning shouldn't clog up memory.
 
-            self.engine.execute(table1.select().where(table1.c.col2
-                                                     == 'foo%d' % i[0]))
+            self.engine.execute(table1.select().where(
+                table1.c.col2 == 'foo%d' % i[0]))
             i[0] += 1
         try:
             go()

test/aaa_profiling/test_zoomark.py

@@ -205,12 +205,11 @@ def fulltable(select):
                                                startswith('L')))) == 2
             assert len(fulltable(Animal.select(Animal.c.Species.
                                                endswith('pede')))) == 2
-            assert len(fulltable(Animal.select(Animal.c.LastEscape
-                                               != None))) == 1
+            assert len(fulltable(
+                Animal.select(Animal.c.LastEscape != None))) == 1  # noqa
             assert len(
-                fulltable(
-                    Animal.select(
-                        None == Animal.c.LastEscape))) == ITERATIONS + 11
+                fulltable(Animal.select(
+                    None == Animal.c.LastEscape))) == ITERATIONS + 11  # noqa
 
             # In operator (containedby)
 
@@ -256,7 +255,7 @@ class thing(object):
                 fulltable(
                     Zoo.select(
                         and_(
-                            Zoo.c.Founded != None,
+                            Zoo.c.Founded != None,  # noqa
                             Zoo.c.Founded < func.current_timestamp(
                                 _type=Date))))) == 3
             assert len(
@@ -313,7 +312,7 @@ def _baseline_5_aggregates(self):
                 assert lifespan == expected[species]
             expected = ['Montr\xe9al Biod\xf4me', 'Wild Animal Park']
             e = select([Zoo.c.Name],
-                       and_(Zoo.c.Founded != None,
+                       and_(Zoo.c.Founded != None,  # noqa
                             Zoo.c.Founded <= func.current_timestamp(),
                             Zoo.c.Founded >= datetime.date(1990,
                                                            1,

test/aaa_profiling/test_zoomark_orm.py

@@ -134,24 +134,24 @@ def _baseline_1a_populate(self):
         self.session.add(Animal(Species='Ostrich', Legs=2, Lifespan=103.2))
         self.session.add(Animal(Species='Centipede', Legs=100))
         self.session.add(Animal(Species='Emperor Penguin', Legs=2,
-                           ZooID=seaworld.ID))
+                                ZooID=seaworld.ID))
         self.session.add(Animal(Species='Adelie Penguin', Legs=2,
-                           ZooID=seaworld.ID))
+                                ZooID=seaworld.ID))
         self.session.add(Animal(Species='Millipede', Legs=1000000,
-                           ZooID=sdz.ID))
+                                ZooID=sdz.ID))
 
         # Add a mother and child to test relationships
 
         bai_yun = Animal(Species='Ape', Nameu='Bai Yun', Legs=2)
         self.session.add(bai_yun)
         self.session.add(Animal(Species='Ape', Name='Hua Mei', Legs=2,
-                           MotherID=bai_yun.ID))
+                                MotherID=bai_yun.ID))
         self.session.commit()
 
     def _baseline_2_insert(self):
         for x in range(ITERATIONS):
             self.session.add(Animal(Species='Tick', Name='Tick %d' % x,
-                               Legs=8))
+                                    Legs=8))
         self.session.flush()
 
     def _baseline_3_properties(self):
@@ -187,30 +187,30 @@ def _baseline_4_expressions(self):
         for x in range(ITERATIONS):
             assert len(list(self.session.query(Zoo))) == 5
             assert len(list(self.session.query(Animal))) == ITERATIONS + 12
-            assert len(list(self.session.query(Animal).filter(Animal.Legs
-                                                         == 4))) == 4
-            assert len(list(self.session.query(Animal).filter(Animal.Legs
-                                                         == 2))) == 5
+            assert len(list(self.session.query(Animal)
+                            .filter(Animal.Legs == 4))) == 4
+            assert len(list(self.session.query(Animal)
+                            .filter(Animal.Legs == 2))) == 5
             assert len(
                 list(
                     self.session.query(Animal).filter(
                         and_(
                             Animal.Legs >= 2,
                             Animal.Legs < 20)))) == ITERATIONS + 9
-            assert len(list(self.session.query(Animal).filter(Animal.Legs
-                                                         > 10))) == 2
-            assert len(list(self.session.query(Animal).filter(Animal.Lifespan
-                                                         > 70))) == 2
+            assert len(list(self.session.query(Animal)
+                            .filter(Animal.Legs > 10))) == 2
+            assert len(list(self.session.query(Animal)
+                            .filter(Animal.Lifespan > 70))) == 2
             assert len(list(self.session.query(Animal).
                             filter(Animal.Species.like('L%')))) == 2
             assert len(list(self.session.query(Animal).
                             filter(Animal.Species.like('%pede')))) == 2
-            assert len(list(self.session.query(Animal).filter(Animal.LastEscape
-                                                         != None))) == 1
+            assert len(list(self.session.query(Animal)
+                            .filter(Animal.LastEscape != None))) == 1  # noqa
             assert len(
                 list(
                     self.session.query(Animal).filter(
-                        Animal.LastEscape == None))) == ITERATIONS + 11
+                        Animal.LastEscape == None))) == ITERATIONS + 11  # noqa
 
             # In operator (containedby)
 
@@ -248,10 +248,10 @@ class thing(object):
                 list(
                     self.session.query(Zoo).filter(
                         and_(
-                            Zoo.Founded != None,
+                            Zoo.Founded != None,  # noqa
                             Zoo.Founded < func.now())))) == 3
-            assert len(list(self.session.query(Animal).filter(Animal.LastEscape
-                                                         == func.now()))) == 0
+            assert len(list(self.session.query(Animal)
+                            .filter(Animal.LastEscape == func.now()))) == 0
             assert len(list(self.session.query(Animal).filter(
                 func.date_part('year', Animal.LastEscape) == 2004))) == 1
             assert len(
@@ -294,7 +294,7 @@ def _baseline_5_aggregates(self):
                 assert lifespan == expected[species]
             expected = ['Montr\xe9al Biod\xf4me', 'Wild Animal Park']
             e = select([Zoo.c.Name],
-                       and_(Zoo.c.Founded != None,
+                       and_(Zoo.c.Founded != None,  # noqa
                             Zoo.c.Founded <= func.current_timestamp(),
                             Zoo.c.Founded >= datetime.date(1990,
                                                            1,
@@ -316,17 +316,17 @@ def _baseline_6_editing(self):
 
             # Edit
 
-            SDZ = self.session.query(Zoo).filter(Zoo.Name == 'San Diego Zoo'
-                                            ).one()
+            SDZ = self.session.query(Zoo).filter(Zoo.Name == 'San Diego Zoo') \
+                  .one()
             SDZ.Name = 'The San Diego Zoo'
             SDZ.Founded = datetime.date(1900, 1, 1)
             SDZ.Opens = datetime.time(7, 30, 0)
             SDZ.Admission = 35.00
 
             # Test edits
 
-            SDZ = self.session.query(Zoo).filter(Zoo.Name
-                                            == 'The San Diego Zoo').one()
+            SDZ = self.session.query(Zoo) \
+                .filter(Zoo.Name == 'The San Diego Zoo').one()
             assert SDZ.Founded == datetime.date(1900, 1, 1), SDZ.Founded
 
             # Change it back
@@ -338,8 +338,8 @@ def _baseline_6_editing(self):
 
             # Test re-edits
 
-            SDZ = self.session.query(Zoo).filter(Zoo.Name == 'San Diego Zoo'
-                                            ).one()
+            SDZ = self.session.query(Zoo).filter(Zoo.Name == 'San Diego Zoo') \
+                .one()
             assert SDZ.Founded == datetime.date(1835, 9, 13), \
                 SDZ.Founded
 

test/base/test_dependency.py

@@ -4,6 +4,7 @@
 from sqlalchemy import exc
 from sqlalchemy.testing import fixtures
 
+
 class DependencySortTest(fixtures.TestBase):
 
     def assert_sort(self, tuples, allitems=None):
@@ -15,7 +16,9 @@ def assert_sort(self, tuples, allitems=None):
         assert conforms_partial_ordering(tuples, result)
 
     def assert_sort_deterministic(self, tuples, allitems, expected):
-        result = list(topological.sort(tuples, allitems, deterministic_order=True))
+        result = list(topological.sort(tuples,
+                                       allitems,
+                                       deterministic_order=True))
         assert conforms_partial_ordering(tuples, result)
         assert result == expected
 
@@ -116,7 +119,7 @@ def test_raise_on_cycle_one(self):
                 'node4']))
             eq_(err.edges, set([('node3', 'node1'), ('node4', 'node1'),
                 ('node2', 'node3'), ('node1', 'node2'),
-                ('node4','node5'), ('node5', 'node4')]))
+                ('node4', 'node5'), ('node5', 'node4')]))
 
     def test_raise_on_cycle_two(self):
 
@@ -138,7 +141,7 @@ def test_raise_on_cycle_two(self):
             eq_(err.cycles, set(['node1', 'node3', 'node2']))
             eq_(err.edges, set([('node3', 'node1'), ('node2', 'node3'),
                 ('node3', 'node2'), ('node1', 'node2'),
-                ('node2','node4')]))
+                ('node2', 'node4')]))
 
     def test_raise_on_cycle_three(self):
         question, issue, providerservice, answer, provider = \
@@ -178,8 +181,7 @@ def test_find_cycle_one(self):
         tuples = [(node1, node2), (node3, node1), (node2, node4),
                   (node3, node2), (node2, node3)]
         eq_(topological.find_cycles(tuples,
-            self._nodes_from_tuples(tuples)), set([node1, node2,
-            node3]))
+            self._nodes_from_tuples(tuples)), set([node1, node2, node3]))
 
     def test_find_multiple_cycles_one(self):
         node1 = 'node1'
@@ -254,7 +256,7 @@ def test_find_multiple_cycles_two(self):
         # node6 only became present here once [ticket:2282] was addressed.
         eq_(
             topological.find_cycles(tuples, allnodes),
-            set(['node1','node2', 'node4', 'node6'])
+            set(['node1', 'node2', 'node4', 'node6'])
         )
 
     def test_find_multiple_cycles_three(self):
@@ -294,16 +296,16 @@ def test_find_multiple_cycles_four(self):
             ('node17', 'node11'), ('node1', 'node19'), ('node15', 'node8'),
             ('node6', 'node20'), ('node14', 'node11'), ('node6', 'node14'),
             ('node11', 'node2'), ('node10', 'node20'), ('node1', 'node11'),
-             ('node20', 'node19'), ('node4', 'node20'), ('node15', 'node20'),
-             ('node9', 'node19'), ('node11', 'node10'), ('node11', 'node19'),
-              ('node13', 'node6'), ('node3', 'node15'), ('node9', 'node11'),
-              ('node4', 'node17'), ('node2', 'node20'), ('node19', 'node10'),
-              ('node8', 'node4'), ('node11', 'node3'), ('node6', 'node1')
+            ('node20', 'node19'), ('node4', 'node20'), ('node15', 'node20'),
+            ('node9', 'node19'), ('node11', 'node10'), ('node11', 'node19'),
+            ('node13', 'node6'), ('node3', 'node15'), ('node9', 'node11'),
+            ('node4', 'node17'), ('node2', 'node20'), ('node19', 'node10'),
+            ('node8', 'node4'), ('node11', 'node3'), ('node6', 'node1')
         ]
         allnodes = ['node%d' % i for i in range(1, 21)]
         eq_(
             topological.find_cycles(tuples, allnodes),
             set(['node11', 'node10', 'node13', 'node15', 'node14', 'node17',
-            'node19', 'node20', 'node8', 'node1', 'node3',
-            'node2', 'node4', 'node6'])
+                 'node19', 'node20', 'node8', 'node1', 'node3', 'node2',
+                 'node4', 'node6'])
         )

test/base/test_events.py

@@ -978,7 +978,7 @@ def test_parent_instance_child_class_apply_after(self):
         # if _JoinedListener fixes .listeners
         # at construction time, then we don't get
         # the new listeners.
-        #eq_(l1.mock_calls, [])
+        # eq_(l1.mock_calls, [])
 
         # alternatively, if _JoinedListener shares the list
         # using a @property, then we get them, at the arguable

test/base/test_except.py

@@ -33,6 +33,7 @@ class OutOfSpec(DatabaseError):
 class WrongNameError(DatabaseError):
     pass
 
+
 # but they're going to call it their "IntegrityError"
 IntegrityError = WrongNameError
 

test/base/test_inspect.py

@@ -5,9 +5,11 @@
 from sqlalchemy import inspection, inspect
 from sqlalchemy.testing import fixtures
 
+
 class TestFixture(object):
     pass
 
+
 class TestInspection(fixtures.TestBase):
 
     def tearDown(self):
@@ -21,7 +23,7 @@ class SomeFoo(TestFixture):
 
         @inspection._inspects(SomeFoo)
         def insp_somefoo(subject):
-            return {"insp":subject}
+            return {"insp": subject}
 
         somefoo = SomeFoo()
         insp = inspect(somefoo)