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.
........
diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py
index 5258c8a..c60578d 100644
--- a/Lib/telnetlib.py
+++ b/Lib/telnetlib.py
@@ -552,7 +552,7 @@
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 @@
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 ed84a5e..0b43d19 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -137,6 +137,8 @@
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)