Commit 35e982f7 authored by R. David Murray's avatar R. David Murray

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.
........
parent acc62be8
...@@ -552,7 +552,7 @@ class Telnet: ...@@ -552,7 +552,7 @@ class Telnet:
line = sys.stdin.readline() line = sys.stdin.readline()
if not line: if not line:
break break
self.write(line) self.write(line.encode('ascii'))
def listener(self): def listener(self):
"""Helper for mt_interact() -- this executes in the other thread.""" """Helper for mt_interact() -- this executes in the other thread."""
...@@ -563,7 +563,7 @@ class Telnet: ...@@ -563,7 +563,7 @@ class Telnet:
print('*** Connection closed by remote host ***') print('*** Connection closed by remote host ***')
return return
if data: if data:
sys.stdout.write(data) sys.stdout.write(data.decode('ascii'))
else: else:
sys.stdout.flush() sys.stdout.flush()
......
...@@ -137,6 +137,8 @@ C-API ...@@ -137,6 +137,8 @@ C-API
Library Library
------- -------
- #7761: telnetlib.interact failures on Windows fixed.
- Issue #5117: Case normalization was needed on ntpath.relpath(). And - Issue #5117: Case normalization was needed on ntpath.relpath(). And
fixed root directory issue on posixpath.relpath(). (Ported working fixes fixed root directory issue on posixpath.relpath(). (Ported working fixes
from ntpath) from ntpath)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment