summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2012-07-11 07:17:54 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2012-07-11 07:17:54 (GMT)
commitfa0989fd38b9e01ec62db7b1c6ed2847628913e4 (patch)
tree0124d0fafbf982ac46a470e46b7198382dccda4b
parentff40aa7b34d144bfd2822d1d7eed42f68ce17831 (diff)
parent67097fd592411ac19684f92beafaaa3f1e2f8e6a (diff)
downloadcpython-fa0989fd38b9e01ec62db7b1c6ed2847628913e4.zip
cpython-fa0989fd38b9e01ec62db7b1c6ed2847628913e4.tar.gz
cpython-fa0989fd38b9e01ec62db7b1c6ed2847628913e4.tar.bz2
merge 3.2
-rw-r--r--Lib/idlelib/run.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index b65aaf8..464861f 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -268,8 +268,8 @@ class _RPCFile(io.TextIOBase):
super.__setattr__(self, 'rpc', rpc)
def __getattribute__(self, name):
- # When accessing the 'rpc' attribute, use ours
- if name == 'rpc':
+ # When accessing the 'rpc' attribute, or 'write', use ours
+ if name in ('rpc', 'write'):
return io.TextIOBase.__getattribute__(self, name)
# Else only look into the remote object only
return getattr(self.rpc, name)