Ask Solem 8 years ago
parent
commit
f59b52524b

+ 2 - 1
Makefile

@@ -66,7 +66,8 @@ configcheck:
 	(cd "$(SPHINX_DIR)"; $(MAKE) configcheck)
 
 flakecheck:
-	$(FLAKE8) "$(PROJ)"
+	# the only way to enable all-1 errors is to ignore one of them.
+	$(FLAKE8) --ignore=W503 "$(PROJ)"
 
 flakediag:
 	-$(MAKE) flakecheck

+ 1 - 1
celery/app/amqp.py

@@ -539,7 +539,7 @@ class AMQP(object):
                     sender=name, body=body,
                     exchange=exchange, routing_key=routing_key,
                     declare=declare, headers=headers2,
-                    properties=kwargs,  retry_policy=retry_policy,
+                    properties=kwargs, retry_policy=retry_policy,
                 )
             ret = producer.publish(
                 body,

+ 1 - 1
celery/security/serialization.py

@@ -81,7 +81,7 @@ class SecureSerializer(object):
         signature = raw_payload[
             first_sep + len(sep):first_sep + len(sep) + sig_len
         ]
-        end_of_sig = first_sep + len(sep) + sig_len+len(sep)
+        end_of_sig = first_sep + len(sep) + sig_len + len(sep)
 
         v = raw_payload[end_of_sig:].split(sep)
 

+ 1 - 1
celery/tests/bin/test_amqp.py

@@ -125,7 +125,7 @@ class test_AMQShell(AppCase):
         self.assertNotIn('FOO', self.fh.getvalue())
 
     def test_run(self):
-        a = self.create_adm('queue.declare',  'foo')
+        a = self.create_adm('queue.declare', 'foo')
         a.run()
         self.assertIn('ok', self.fh.getvalue())
 

+ 1 - 1
celery/tests/utils/test_datastructures.py

@@ -287,7 +287,7 @@ class test_LimitedSet(Case):
         s5 = LimitedSet(maxlen=10, expires=None)
         for i in range(12):
             s1.add(i)
-            s2.add(i*i)
+            s2.add(i * i)
         s3.update(s1)
         s3.update(s2)
         s4.update(s1.as_dict())

+ 5 - 5
celery/tests/utils/test_saferepr.py

@@ -64,11 +64,11 @@ def old_repr(s):
             RE_OLD_SET_REPR.sub(
                 RE_OLD_SET_REPR_REPLACE,
                 RE_OLD_SET_CUSTOM_REPR.sub(
-                    RE_OLD_SET_CUSTOM_REPR_REPLACE, repr(s).replace("u'", "'"))
-                ),
+                    RE_OLD_SET_CUSTOM_REPR_REPLACE, repr(s).replace("u'", "'"),
+                )
             ),
         ),
-    ).replace('set([])', 'set()')
+    )).replace('set([])', 'set()')
 
 
 class list2(list):
@@ -175,14 +175,14 @@ class test_saferepr(Case):
         # multiple lines.  For that reason, dicts with more than one element
         # aren't tested here.
         types = (
-            0, 0, 0+0j, 0.0, '', b'',
+            0, 0, 0 + 0j, 0.0, '', b'',
             (), tuple2(), tuple3(),
             [], list2(), list3(),
             set(), set2(), set3(),
             frozenset(), frozenset2(), frozenset3(),
             {}, dict2(), dict3(),
             self.assertTrue, pprint,
-            -6, -6, -6-6j, -1.5, 'x', b'x', (3,), [3], {3: 6},
+            -6, -6, -6 - 6j, -1.5, 'x', b'x', (3,), [3], {3: 6},
             (1, 2), [3, 4], {5: 6},
             tuple2((1, 2)), tuple3((1, 2)), tuple3(range(100)),
             [3, 4], list2([3, 4]), list3([3, 4]), list3(range(100)),

+ 1 - 1
tox.ini

@@ -42,7 +42,7 @@ commands =
 
 [testenv:flake8]
 commands =
-    flake8 {toxinidir}/celery
+    flake8 --exclude=W503 {toxinidir}/celery
 
 [testenv:flakeplus]
 commands =