Mercurial > cpython-lru_cache-weakref
diff Lib/idlelib/PyShell.py @ 78274:cffdb7d76691
merge 3.2
| author | Martin v. Löwis <martin@v.loewis.de> |
|---|---|
| date | Wed, 25 Jul 2012 10:49:32 +0200 |
| parents | 4915cd0cb7af a82fd35e28be |
| children | 1da53d86d722 |
line wrap: on
line diff
--- a/Lib/idlelib/PyShell.py Tue Jul 24 21:23:53 2012 +0200 +++ b/Lib/idlelib/PyShell.py Wed Jul 25 10:49:32 2012 +0200 @@ -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 = """\
