Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
e2b5624e
Commit
e2b5624e
authored
Jul 25, 2012
by
Martin v. Löwis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #15318: Prevent writing to sys.stdin.
Patch by Roger Serwy and myself.
parent
7009845c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
7 deletions
+38
-7
Lib/idlelib/NEWS.txt
Lib/idlelib/NEWS.txt
+2
-0
Lib/idlelib/PyShell.py
Lib/idlelib/PyShell.py
+15
-1
Lib/idlelib/run.py
Lib/idlelib/run.py
+21
-6
No files found.
Lib/idlelib/NEWS.txt
View file @
e2b5624e
What's New in IDLE 2.7.4?
=========================
- Issue #15318: Prevent writing to sys.stdin.
- Issue #13532, #15319: Check that arguments to sys.stdout.write are strings.
- Issue # 12510: Attempt to get certain tool tips no longer crashes IDLE.
...
...
Lib/idlelib/PyShell.py
View file @
e2b5624e
...
...
@@ -11,6 +11,7 @@ import time
import
threading
import
traceback
import
types
import
io
import
linecache
from
code
import
InteractiveInterpreter
...
...
@@ -422,6 +423,9 @@ class ModifiedInterpreter(InteractiveInterpreter):
except
socket
.
timeout
,
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
)
...
...
@@ -875,13 +879,14 @@ class PyShell(OutputWindow):
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
#
self
.
history
=
self
.
History
(
self
.
text
)
#
...
...
@@ -1279,6 +1284,15 @@ class PseudoFile(object):
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 = """
\
...
...
Lib/idlelib/run.py
View file @
e2b5624e
...
...
@@ -260,7 +260,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
)
...
...
@@ -268,20 +268,35 @@ 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
,
basestring
):
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
,
(
basestring
,
bytearray
)):
raise
TypeError
(
'must be string, 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"
))
from
idlelib
import
IOBinding
sys
.
stdin
.
encoding
=
sys
.
stdout
.
encoding
=
\
sys
.
stderr
.
encoding
=
IOBinding
.
encoding
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment