From: W. Trevor King <wking@drexel.edu>
Date: Tue, 17 Nov 2009 13:21:56 +0000 (-0500)
Subject: rename "output","error" -> "stdout","stderr" in VCS._u_invoke()
X-Git-Tag: 1.0.0~59^2~83^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b1dbae97e769346246e8a36424c60ce89ef7a310;p=be.git

rename "output","error" -> "stdout","stderr" in VCS._u_invoke()
---

diff --git a/libbe/vcs.py b/libbe/vcs.py
index 7484660..c260af1 100644
--- a/libbe/vcs.py
+++ b/libbe/vcs.py
@@ -474,13 +474,13 @@ class VCS(object):
                           shell=True, cwd=cwd)
         except OSError, e :
             raise CommandError(args, status=e.args[0], stdout="", stderr=e)
-        output,error = q.communicate(input=stdin)
+        stdout,stderr = q.communicate(input=stdin)
         status = q.wait()
         if self.verboseInvoke == True:
-            print >> sys.stderr, "%d\n%s%s" % (status, output, error)
+            print >> sys.stderr, "%d\n%s%s" % (status, stdout, stderr)
         if status not in expect:
-            raise CommandError(args, status, output, error)
-        return status, output, error
+            raise CommandStderr(args, status, stdout, stderr)
+        return status, stdout, stderr
     def _u_invoke_client(self, *args, **kwargs):
         directory = kwargs.get('directory',None)
         expect = kwargs.get('expect', (0,))