From 35e982f770e9898cf72ca7a434d892c3396a2734 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Tue, 26 Oct 2010 12:47:19 +0000 Subject: 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. ........ --- Lib/telnetlib.py | 4 ++-- Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) 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 @@ 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 ed84a5e..0b43d19 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) -- cgit v0.12