summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/run.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2012-07-11 06:49:24 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2012-07-11 06:49:24 (GMT)
commitff40aa7b34d144bfd2822d1d7eed42f68ce17831 (patch)
tree9344fb6e44b2504440dcf7c57d9c13a5666fc541 /Lib/idlelib/run.py
parent9ba4545f974a70d6740b5ef674483b6621978416 (diff)
parentc27616580dfd7a4693c28c44ecd03cf749ff45fc (diff)
downloadcpython-ff40aa7b34d144bfd2822d1d7eed42f68ce17831.zip
cpython-ff40aa7b34d144bfd2822d1d7eed42f68ce17831.tar.gz
cpython-ff40aa7b34d144bfd2822d1d7eed42f68ce17831.tar.bz2
merge 3.2
Diffstat (limited to 'Lib/idlelib/run.py')
-rw-r--r--Lib/idlelib/run.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index e5a8e6e..b65aaf8 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -260,12 +260,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):