summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-12-25 12:24:35 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-12-25 12:24:35 (GMT)
commit0fd557647d9957542a68972854a227d2def5f5f3 (patch)
treeb00d297773e829bfff7abcdad226c54e1ab212b9
parentf47036c1309536c048890c265605b06daf7bdc9c (diff)
downloadcpython-0fd557647d9957542a68972854a227d2def5f5f3.zip
cpython-0fd557647d9957542a68972854a227d2def5f5f3.tar.gz
cpython-0fd557647d9957542a68972854a227d2def5f5f3.tar.bz2
Issue #20058: sys.stdin.readline() in IDLE now always returns only one line.
-rwxr-xr-xLib/idlelib/PyShell.py3
-rw-r--r--Misc/NEWS2
2 files changed, 5 insertions, 0 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index 6674f4e..55fd357 100755
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1381,6 +1381,9 @@ class PseudoInputFile(PseudoFile):
line = self._line_buffer or self.shell.readline()
if size < 0:
size = len(line)
+ eol = line.find('\n', 0, size)
+ if eol >= 0:
+ size = eol + 1
self._line_buffer = line[size:]
return line[:size]
diff --git a/Misc/NEWS b/Misc/NEWS
index 8dddb6a..f9db232 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -169,6 +169,8 @@ Library
IDLE
----
+- Issue #20058: sys.stdin.readline() in IDLE now always returns only one line.
+
- Issue #19481: print() of string subclass instance in IDLE no longer hangs.
- Issue #18270: Prevent possible IDLE AttributeError on OS X when no initial