Ask Solem il y a 14 ans
Parent
commit
f37632eb3f

+ 0 - 1
celery/app/base.py

@@ -231,7 +231,6 @@ class BaseApp(object):
 
         return c
 
-
     def mail_admins(self, subject, body, fail_silently=False):
         """Send an e-mail to the admins in conf.ADMINS."""
         if not self.conf.ADMINS:

+ 0 - 2
celery/task/__init__.py

@@ -97,5 +97,3 @@ def ping():  # ✞
         "The ping task has been deprecated and will be removed in Celery "
         "v2.3.  Please use inspect.ping instead."))
     return PingTask.apply_async().get()
-
-

+ 1 - 0
celery/task/base.py

@@ -24,6 +24,7 @@ Please use `from celery.task import %(symbol)s` instead.
 
 """
 
+
 def __deprecated_import(fun):
 
     @wraps(fun)

+ 1 - 1
celery/task/sets.py

@@ -140,7 +140,7 @@ class TaskSet(UserList):
                               DeprecationWarning)
 
         self.app = app_or_default(app)
-        self.data = list(tasks)
+        self.data = list(tasks or [])
         self.total = len(self.tasks)
         self.Publisher = Publisher or self.app.amqp.TaskPublisher
 

+ 2 - 3
celery/tests/test_bin/test_celeryd.py

@@ -1,11 +1,8 @@
 import logging
 import os
 import sys
-from celery.tests.utils import unittest
-from celery.tests.utils import StringIO
 
 from multiprocessing import get_logger, current_process
-from StringIO import StringIO
 
 from celery import Celery
 from celery import platforms
@@ -19,6 +16,8 @@ from celery.utils.functional import wraps
 
 from celery.tests.compat import catch_warnings
 from celery.tests.utils import execute_context
+from celery.tests.utils import unittest
+from celery.tests.utils import StringIO
 
 
 patch.ensure_process_aware_logger()

+ 10 - 0
contrib/release/flakesignore.txt

@@ -31,3 +31,13 @@ celery/utils/functional.py:(.+?) redefinition of unused 'wraps'
 celery/utils/mail.py:(.+?) redefinition of unused 'MIMEText'
 celery/utils/__init__.py:(.+?) 'gen_unique_id' imported but unused
 celery/events/cursesmon.py:(.+?): local variable 'consumer' is assigned to but never used
+celery/tests/test_task_http.py:(.+?): redefinition of unused 'addinfourl' from line 7
+celery/tests/utils.py:(.+?): 'unittest' imported but unused
+celery/tests/utils.py:(.+?): redefinition of unused 'builtins' from line 12
+celery/tests/utils.py:(.+?): redefinition of unused 'StringIO' from line 16
+celery/utils/compat.py:(.+?): redefinition of unused 'UserList' from line 5
+celery/utils/compat.py:(.+?): 'UserList' imported but unused
+celery/utils/compat.py:(.+?): redefinition of unused 'UserDict' from line 10
+celery/utils/compat.py:(.+?): 'UserDict' imported but unused
+celery/utils/compat.py:(.+?): redefinition of unused 'OrderedDict' from line 260
+