summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-10-26 12:47:19 +0000
committerR. David Murray <rdmurray@bitdance.com>2010-10-26 12:47:19 +0000
commit35e982f770e9898cf72ca7a434d892c3396a2734 (patch)
treef4dd1018a552804c49fc505eb9c997f31212cdfa
parentacc62be8aab359b7fa8875677356f98b396d8506 (diff)
downloadcpython-git-35e982f770e9898cf72ca7a434d892c3396a2734.tar.gz
Merged revisions 85846 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85846 | r.david.murray | 2010-10-26 08:42:24 -0400 (Tue, 26 Oct 2010) | 2 lines #7761: fix telnetlib.interact failures on Windows. ........
-rw-r--r--Lib/telnetlib.py4
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py
index 5258c8ad20..c60578debf 100644
--- a/Lib/telnetlib.py
+++ b/Lib/telnetlib.py
@@ -552,7 +552,7 @@ class Telnet:
line = sys.stdin.readline()
if not line:
break
- self.write(line)
+ self.write(line.encode('ascii'))
def listener(self):
"""Helper for mt_interact() -- this executes in the other thread."""
@@ -563,7 +563,7 @@ class Telnet:
print('*** Connection closed by remote host ***')
return
if data:
- sys.stdout.write(data)
+ sys.stdout.write(data.decode('ascii'))
else:
sys.stdout.flush()
diff --git a/Misc/NEWS b/Misc/NEWS
index ed84a5eae4..0b43d198f1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -137,6 +137,8 @@ C-API
Library
-------
+- #7761: telnetlib.interact failures on Windows fixed.
+
- Issue #5117: Case normalization was needed on ntpath.relpath(). And
fixed root directory issue on posixpath.relpath(). (Ported working fixes
from ntpath)