Jelajahi Sumber

Some changes broke Python 2.4 compatibility

Ask Solem 14 tahun lalu
induk
melakukan
6084bac912

+ 4 - 4
celery/tests/test_backends/test_cache.py

@@ -73,10 +73,10 @@ class test_get_best_memcache(unittest.TestCase):
         memcache.Client = DummyClient
         memcache.Client = DummyClient
         memcache.Client.__module__ = memcache.__name__
         memcache.Client.__module__ = memcache.__name__
         prev, sys.modules["memcache"] = sys.modules.get("memcache"), memcache
         prev, sys.modules["memcache"] = sys.modules.get("memcache"), memcache
-        yield
+        yield True
         if prev is not None:
         if prev is not None:
             sys.modules["memcache"] = prev
             sys.modules["memcache"] = prev
-        yield
+        yield True
 
 
     def mock_pylibmc(self):
     def mock_pylibmc(self):
         pylibmc = types.ModuleType("pylibmc")
         pylibmc = types.ModuleType("pylibmc")
@@ -84,10 +84,10 @@ class test_get_best_memcache(unittest.TestCase):
         pylibmc.Client.__module__ = pylibmc.__name__
         pylibmc.Client.__module__ = pylibmc.__name__
         prev = sys.modules.get("pylibmc")
         prev = sys.modules.get("pylibmc")
         sys.modules["pylibmc"] = pylibmc
         sys.modules["pylibmc"] = pylibmc
-        yield
+        yield True
         if prev is not None:
         if prev is not None:
             sys.modules["pylibmc"] = prev
             sys.modules["pylibmc"] = prev
-        yield
+        yield True
 
 
     def test_pylibmc(self):
     def test_pylibmc(self):
         pylibmc = self.mock_pylibmc()
         pylibmc = self.mock_pylibmc()

+ 1 - 0
celery/tests/test_result.py

@@ -4,6 +4,7 @@ import unittest2 as unittest
 
 
 from celery import states
 from celery import states
 from celery.utils import gen_unique_id
 from celery.utils import gen_unique_id
+from celery.utils.compat import all
 from celery.result import AsyncResult, TaskSetResult
 from celery.result import AsyncResult, TaskSetResult
 from celery.backends import default_backend
 from celery.backends import default_backend
 from celery.exceptions import TimeoutError
 from celery.exceptions import TimeoutError

+ 1 - 0
celery/worker/job.py

@@ -11,6 +11,7 @@ from celery.execute.trace import TaskTrace
 from celery.loaders import current_loader
 from celery.loaders import current_loader
 from celery.registry import tasks
 from celery.registry import tasks
 from celery.utils import noop, kwdict, fun_takes_kwargs
 from celery.utils import noop, kwdict, fun_takes_kwargs
+from celery.utils.compat import any
 from celery.utils.mail import mail_admins
 from celery.utils.mail import mail_admins
 from celery.worker import state
 from celery.worker import state