mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.2

Browse source
This commit is contained in:
Martin v. Löwis 2012-07-09 20:48:56 +02:00
commit 79007fa05d
3 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/idlelib/run.py
View file

@ -1,4 +1,5 @@
import sys
import io
import linecache
import time
import socket
@ -257,6 +258,23 @@ class MyRPCServer(rpc.RPCServer):
quitting = True
thread.interrupt_main()
class _RPCFile(io.TextIOBase):
"""Wrapper class for the RPC proxy to typecheck arguments
that may not support pickling."""
def __init__(self, rpc):
super.__setattr__(self, 'rpc', rpc)
def __getattr__(self, name):
return getattr(self.rpc, name)
def __setattr__(self, name, value):
return setattr(self.rpc, name, value)
def write(self, s):
if not isinstance(s, str):
raise TypeError('must be str, not ' + type(s).__name__)
return self.rpc.write(s)
class MyHandler(rpc.RPCHandler):
@ -264,9 +282,9 @@ class MyHandler(rpc.RPCHandler):
"""Override base method"""
executive = Executive(self)
self.register("exec", executive)
sys.stdin = self.console = self.get_remote_proxy("stdin")
sys.stdout = self.get_remote_proxy("stdout")
sys.stderr = self.get_remote_proxy("stderr")
sys.stdin = self.console = _RPCFile(self.get_remote_proxy("stdin"))
sys.stdout = _RPCFile(self.get_remote_proxy("stdout"))
sys.stderr = _RPCFile(self.get_remote_proxy("stderr"))
sys.displayhook = rpc.displayhook
# page help() text to shell.
import pydoc # import must be done here to capture i/o binding