Ask Solem 8 years ago
parent
commit
2aa20ec9a5

+ 1 - 2
celery/tests/utils/test_deprecated.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
-from celery.tests.case import Case, Mock, patch
+from celery.tests.case import Case, patch
 
 from celery.utils import deprecated
 
@@ -60,7 +60,6 @@ class test_deprecated_property(Case):
             del(x.foo)
 
 
-
 class test_warn(Case):
 
     @patch('warnings.warn')

+ 1 - 3
celery/tests/utils/test_nodenames.py

@@ -6,7 +6,7 @@ from celery.utils import (
     worker_direct,
 )
 
-from celery.tests.case import Case, Mock, patch
+from celery.tests.case import Case
 
 
 class test_worker_direct(Case):
@@ -14,5 +14,3 @@ class test_worker_direct(Case):
     def test_returns_if_queue(self):
         q = Queue('foo')
         self.assertIs(worker_direct(q), q)
-
-

+ 1 - 9
celery/tests/utils/test_utils.py

@@ -11,11 +11,10 @@ from celery.utils import (
     isatty,
     is_iterable,
     cached_property,
-    worker_direct,
     gen_task_name,
     jsonify,
 )
-from celery.tests.case import Case, Mock, patch
+from celery.tests.case import Case, Mock
 
 
 class test_isatty(Case):
@@ -27,13 +26,6 @@ class test_isatty(Case):
         self.assertFalse(isatty(fh))
 
 
-class test_worker_direct(Case):
-
-    def test_returns_if_queue(self):
-        q = Queue('foo')
-        self.assertIs(worker_direct(q), q)
-
-
 class test_gen_task_name(Case):
 
     def test_no_module(self):

+ 2 - 2
celery/utils/deprecated.py

@@ -14,7 +14,7 @@ from vine.utils import wraps
 
 from celery.exceptions import CPendingDeprecationWarning, CDeprecationWarning
 
-__all__ = ['Callbable', 'Property', 'warn']
+__all__ = ['Callable', 'Property', 'warn']
 
 
 PENDING_DEPRECATION_FMT = """
@@ -71,7 +71,7 @@ def Callable(deprecation=None, removal=None,
 
 
 def Property(deprecation=None, removal=None,
-                        alternative=None, description=None):
+             alternative=None, description=None):
     def _inner(fun):
         return _deprecated_property(
             fun, deprecation=deprecation, removal=removal,