From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 11 Jul 2012 06:49:58 +0000 (+0200)
Subject: Don't use TextIOBase implementations in _RPCFile.
X-Git-Tag: v2.7.4rc1~705
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ba32187c0737b3b8ae63b9ea215be7c2d423e6d;p=thirdparty%2FPython%2Fcpython.git

Don't use TextIOBase implementations in _RPCFile.
---

diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index c1b974a5e228..831235de8589 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -251,12 +251,18 @@ class MyRPCServer(rpc.RPCServer):
 
 class _RPCFile(io.TextIOBase):
     """Wrapper class for the RPC proxy to typecheck arguments
-    that may not support pickling."""
+    that may not support pickling. The base class is there only
+    to support type tests; all implementations come from the remote
+    object."""
 
     def __init__(self, rpc):
         super.__setattr__(self, 'rpc', rpc)
 
-    def __getattr__(self, name):
+    def __getattribute__(self, name):
+        # When accessing the 'rpc' attribute, use ours
+        if name == 'rpc':
+            return io.TextIOBase.__getattribute__(self, name)
+        # Else only look into the remote object only
         return getattr(self.rpc, name)
 
     def __setattr__(self, name, value):