From patchwork Sat Sep 27 04:31:44 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [3,of,3] cmdserver: drop useless in_ attribute from channeledoutput
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 5991
Message-Id: <e5f8fa91ad36d260cc68.1411792304@mimosa>
To: mercurial-devel@selenic.com
Date: Sat, 27 Sep 2014 13:31:44 +0900

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1411789073 -32400
#      Sat Sep 27 12:37:53 2014 +0900
# Node ID e5f8fa91ad36d260cc68e53e71c91883f608bc7a
# Parent  c1ab38c0a930e39eefaf6ffa794e3fa838b46dc5
cmdserver: drop useless in_ attribute from channeledoutput

diff --git a/mercurial/commandserver.py b/mercurial/commandserver.py
--- a/mercurial/commandserver.py
+++ b/mercurial/commandserver.py
@@ -28,8 +28,7 @@ class channeledoutput(object):
     data length (unsigned int),
     data
     """
-    def __init__(self, in_, out, channel):
-        self.in_ = in_
+    def __init__(self, out, channel):
         self.out = out
         self.channel = channel
 
@@ -43,7 +42,7 @@ class channeledoutput(object):
     def __getattr__(self, attr):
         if attr in ('isatty', 'fileno'):
             raise AttributeError(attr)
-        return getattr(self.in_, attr)
+        return getattr(self.out, attr)
 
 class channeledinput(object):
     """
@@ -138,7 +137,7 @@ class server(object):
             global logfile
             if logpath == '-':
                 # write log on a special 'd' (debug) channel
-                logfile = channeledoutput(sys.stdout, sys.stdout, 'd')
+                logfile = channeledoutput(sys.stdout, 'd')
             else:
                 logfile = open(logpath, 'a')
 
@@ -153,10 +152,10 @@ class server(object):
             self.repo = self.repoui = None
 
         if mode == 'pipe':
-            self.cerr = channeledoutput(sys.stdout, sys.stdout, 'e')
-            self.cout = channeledoutput(sys.stdout, sys.stdout, 'o')
+            self.cerr = channeledoutput(sys.stdout, 'e')
+            self.cout = channeledoutput(sys.stdout, 'o')
             self.cin = channeledinput(sys.stdin, sys.stdout, 'I')
-            self.cresult = channeledoutput(sys.stdout, sys.stdout, 'r')
+            self.cresult = channeledoutput(sys.stdout, 'r')
 
             self.client = sys.stdin
         else: