mirror of
https://github.com/python/cpython.git
synced 2025-10-09 16:34:44 +00:00
Issue #15318: Prevent writing to sys.stdin.
Patch by Roger Serwy and myself.
This commit is contained in:
parent
186396dce6
commit
c882b7c51a
3 changed files with 38 additions and 5 deletions
|
@ -256,7 +256,7 @@ class _RPCFile(io.TextIOBase):
|
|||
|
||||
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)
|
||||
|
@ -264,20 +264,37 @@ class _RPCFile(io.TextIOBase):
|
|||
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"))
|
||||
# page help() text to shell.
|
||||
import pydoc # import must be done here to capture i/o binding
|
||||
pydoc.pager = pydoc.plainpager
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue