Browse Source

Removes expected error output from tests

Ask Solem 13 years ago
parent
commit
980df77feb
3 changed files with 5 additions and 9 deletions
  1. 3 7
      celery/result.py
  2. 1 1
      celery/utils/threads.py
  3. 1 1
      celery/utils/timer2.py

+ 3 - 7
celery/result.py

@@ -126,19 +126,15 @@ class AsyncResult(object):
 
         """
         stack = deque([self])
-
         native_join = self.supports_native_join
-        popleft = stack.popleft
-        extend = stack.extend
-        append = stack.append
 
         while stack:
-            res = popleft()
+            res = stack.popleft()
             if isinstance(res, ResultSet):
                 j = res.join_native if native_join else res.join
-                extend(j(timeout=timeout, propagate=propagate))
+                stack.extend(j(timeout=timeout, propagate=propagate))
             elif isinstance(res, AsyncResult):
-                append(res.get(timeout=timeout, propagate=propagate))
+                stack.append(res.get(timeout=timeout, propagate=propagate))
             else:
                 yield res
 

+ 1 - 1
celery/utils/threads.py

@@ -42,7 +42,7 @@ class bgThread(Thread):
     def on_crash(self, exc_info, msg, *fmt, **kwargs):
         sys.stderr.write((msg + "\n") % fmt)
         traceback.print_exception(exc_info[0], exc_info[1], exc_info[2],
-                                  None, sys.__stderr__)
+                                  None, sys.stderr)
 
     def run(self):
         shutdown = self._is_shutdown

+ 1 - 1
celery/utils/timer2.py

@@ -197,7 +197,7 @@ class Timer(Thread):
                     traceback.print_exception(exc_info[0],
                                               exc_info[1],
                                               exc_info[2],
-                                              None, sys.__stderr__)
+                                              None, sys.stderr)
             finally:
                 del(exc_info)