mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
........
This commit is contained in:
R. David Murray 2010-10-26 12:47:19 +00:00
parent acc62be8aa
commit 35e982f770
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/telnetlib.py
View File

@ -552,7 +552,7 @@ def mt_interact(self):
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 @@ def listener(self):
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()

2
Misc/NEWS
View File

@ -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)