Просмотр исходного кода

Multi: Now outputs to stdout instead of stderr for non-errors

Ask Solem 10 лет назад
Родитель
Сommit
6056f8bafb
1 измененных файлов с 10 добавлено и 5 удалено
  1. 10 5
      celery/bin/multi.py

+ 10 - 5
celery/bin/multi.py

@@ -164,8 +164,10 @@ class MultiTool(object):
     retcode = 0  # Final exit code.
     retcode = 0  # Final exit code.
 
 
     def __init__(self, env=None, fh=None, quiet=False, verbose=False,
     def __init__(self, env=None, fh=None, quiet=False, verbose=False,
-                 no_color=False, nosplash=False):
-        self.fh = fh or sys.stderr
+                 no_color=False, nosplash=False, stdout=None, stderr=None):
+        """fh is an old alias to stdout."""
+        self.stdout = self.fh = stdout or fh or sys.stdout
+        self.stderr = stderr or sys.stderr
         self.env = env
         self.env = env
         self.nosplash = nosplash
         self.nosplash = nosplash
         self.quiet = quiet
         self.quiet = quiet
@@ -210,8 +212,11 @@ class MultiTool(object):
 
 
         return self.retcode
         return self.retcode
 
 
-    def say(self, m, newline=True):
-        print(m, file=self.fh, end='\n' if newline else '')
+    def say(self, m, newline=True, file=None):
+        print(m, file=file or self.stdout, end='\n' if newline else '')
+
+    def carp(self, m, newline=True, file=None):
+        return self.say(m, newline, file or self.stderr)
 
 
     def names(self, argv, cmd):
     def names(self, argv, cmd):
         p = NamespacedOptionParser(argv)
         p = NamespacedOptionParser(argv)
@@ -421,7 +426,7 @@ class MultiTool(object):
 
 
     def error(self, msg=None):
     def error(self, msg=None):
         if msg:
         if msg:
-            self.say(msg)
+            self.carp(msg)
         self.usage()
         self.usage()
         self.retcode = 1
         self.retcode = 1
         return 1
         return 1