Преглед изворни кода

Removes compat AsyncResult.wait() (use .get())

Ask Solem пре 8 година
родитељ
комит
b6bae1da2e
2 измењених фајлова са 5 додато и 7 уклоњено
  1. 0 2
      celery/result.py
  2. 5 5
      celery/tests/tasks/test_result.py

+ 0 - 2
celery/result.py

@@ -181,7 +181,6 @@ class AsyncResult(ResultBase):
             propagate=propagate,
             propagate=propagate,
             callback=callback,
             callback=callback,
         )
         )
-    wait = get  # deprecated alias to :meth:`get`.
 
 
     def _maybe_reraise_parent_error(self):
     def _maybe_reraise_parent_error(self):
         for node in reversed(list(self._parents())):
         for node in reversed(list(self._parents())):
@@ -891,7 +890,6 @@ class EagerResult(AsyncResult):
             if propagate:
             if propagate:
                 raise self.result
                 raise self.result
             return self.result
             return self.result
-    wait = get  # XXX Compat (remove 5.0)
 
 
     def forget(self):
     def forget(self):
         pass
         pass

+ 5 - 5
celery/tests/tasks/test_result.py

@@ -832,15 +832,15 @@ class test_EagerResult(AppCase):
             raise KeyError(x, y)
             raise KeyError(x, y)
         self.raising = raising
         self.raising = raising
 
 
-    def test_wait_raises(self):
+    def test_get_raises(self):
         res = self.raising.apply(args=[3, 3])
         res = self.raising.apply(args=[3, 3])
         with self.assertRaises(KeyError):
         with self.assertRaises(KeyError):
-            res.wait()
-        self.assertTrue(res.wait(propagate=False))
+            res.get()
+        self.assertTrue(res.get(propagate=False))
 
 
-    def test_wait(self):
+    def test_get(self):
         res = EagerResult('x', 'x', states.RETRY)
         res = EagerResult('x', 'x', states.RETRY)
-        res.wait()
+        res.get()
         self.assertEqual(res.state, states.RETRY)
         self.assertEqual(res.state, states.RETRY)
         self.assertEqual(res.status, states.RETRY)
         self.assertEqual(res.status, states.RETRY)