diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2012-07-09 18:46:11 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2012-07-09 18:46:11 (GMT) |
commit | 9ae3f7a189e3d05bf14835e9e2b8aff77661c1ba (patch) | |
tree | 78266cb61e0dac843553c40327ef03dbe166107d /Lib/idlelib | |
parent | 44dea9d03f58c2c53f3547f89ad50a864ba8b455 (diff) | |
download | cpython-9ae3f7a189e3d05bf14835e9e2b8aff77661c1ba.zip cpython-9ae3f7a189e3d05bf14835e9e2b8aff77661c1ba.tar.gz cpython-9ae3f7a189e3d05bf14835e9e2b8aff77661c1ba.tar.bz2 |
Issue #13532: Check that arguments to sys.stdout.write are strings.
Diffstat (limited to 'Lib/idlelib')
-rw-r--r-- | Lib/idlelib/NEWS.txt | 2 | ||||
-rw-r--r-- | Lib/idlelib/PyShell.py | 2 | ||||
-rw-r--r-- | Lib/idlelib/run.py | 24 |
3 files changed, 25 insertions, 3 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index d57237d..d99e231 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -1,6 +1,8 @@ What's New in IDLE 3.2.4? ========================= +- Issue #13532: Check that arguments to sys.stdout.write are strings. + - Issue # 12510: Attempt to get certain tool tips no longer crashes IDLE. Erroneous tool tips have been corrected. Default added for callables. diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 278f4f6..a25ca87 100644 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -1242,6 +1242,8 @@ class PseudoFile(object): self.encoding = encoding def write(self, s): + if not isinstance(s, str): + raise TypeError('must be str, not ' + type(s).__name__) self.shell.write(s, self.tags) def writelines(self, lines): diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py index 25338ff..84a5f81 100644 --- a/Lib/idlelib/run.py +++ b/Lib/idlelib/run.py @@ -1,4 +1,5 @@ import sys +import io import linecache import time import socket @@ -244,6 +245,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): @@ -251,9 +269,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")) # page help() text to shell. import pydoc # import must be done here to capture i/o binding pydoc.pager = pydoc.plainpager |