diff -r 4752fafb579d Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py Wed Jul 11 19:21:31 2012 +0200 +++ b/Lib/idlelib/PyShell.py Wed Jul 11 19:21:09 2012 -0500 @@ -12,6 +12,7 @@ import tokenize import traceback import types +import io import linecache from code import InteractiveInterpreter @@ -410,6 +411,9 @@ except socket.timeout as err: self.display_no_subprocess_error() return None + # Can't regiter self.tkconsole.stdin, since run.py wants to + # call non-TextIO methods on it (such as getvar) + # XXX should be renamed to "console" self.rpcclt.register("stdin", self.tkconsole) self.rpcclt.register("stdout", self.tkconsole.stdout) self.rpcclt.register("stderr", self.tkconsole.stderr) @@ -854,13 +858,14 @@ self.save_stderr = sys.stderr self.save_stdin = sys.stdin from idlelib import IOBinding + self.stdin = PseudoInputFile(self) self.stdout = PseudoFile(self, "stdout", IOBinding.encoding) self.stderr = PseudoFile(self, "stderr", IOBinding.encoding) self.console = PseudoFile(self, "console", IOBinding.encoding) if not use_subprocess: sys.stdout = self.stdout sys.stderr = self.stderr - sys.stdin = self + sys.stdin = self.stdin try: # page help() text to shell. import pydoc # import must be done here to capture i/o rebinding. @@ -1272,6 +1277,15 @@ def isatty(self): return True +class PseudoInputFile(object): + def __init__(self, shell): + self.readline = shell.readline + self.isatty = shell.isatty + + def write(self, s): + raise io.UnsupportedOperation("not writable") + writelines = write + usage_msg = """\ diff -r 4752fafb579d Lib/idlelib/run.py --- a/Lib/idlelib/run.py Wed Jul 11 19:21:31 2012 +0200 +++ b/Lib/idlelib/run.py Wed Jul 11 19:21:09 2012 -0500 @@ -269,7 +269,7 @@ def __getattribute__(self, name): # When accessing the 'rpc' attribute, or 'write', use ours - if name in ('rpc', 'write'): + if name in ('rpc', 'write', 'writelines'): return io.TextIOBase.__getattribute__(self, name) # Else only look into the remote object only return getattr(self.rpc, name) @@ -277,20 +277,35 @@ def __setattr__(self, name, value): return setattr(self.rpc, name, value) + @staticmethod + def _ensure_string(func): + def f(self, s): + if not isinstance(s, str): + raise TypeError('must be str, not ' + type(s).__name__) + return func(self, s) + return f + +class _RPCOutputFile(_RPCFile): + @_RPCFile._ensure_string def write(self, s): - if not isinstance(s, str): - raise TypeError('must be str, not ' + type(s).__name__) return self.rpc.write(s) +class _RPCInputFile(_RPCFile): + @_RPCFile._ensure_string + def write(self, s): + raise io.UnsupportedOperation("not writable") + writelines = write + class MyHandler(rpc.RPCHandler): def handle(self): """Override base method""" executive = Executive(self) self.register("exec", executive) - sys.stdin = self.console = self.get_remote_proxy("stdin") - sys.stdout = _RPCFile(self.get_remote_proxy("stdout")) - sys.stderr = _RPCFile(self.get_remote_proxy("stderr")) + self.console = self.get_remote_proxy("stdin") + sys.stdin = _RPCInputFile(self.console) + sys.stdout = _RPCOutputFile(self.get_remote_proxy("stdout")) + sys.stderr = _RPCOutputFile(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