[Python-checkins] r85847 - in python/branches/release31-maint: Lib/telnetlib.py Misc/NEWS

[r.david.murray]

Author: r.david.murray
Date: Tue Oct 26 14:47:19 2010
New Revision: 85847

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/telnetlib.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/telnetlib.py
==============================================================================
--- python/branches/release31-maint/Lib/telnetlib.py	(original)
+++ python/branches/release31-maint/Lib/telnetlib.py	Tue Oct 26 14:47:19 2010
@@ -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()
 

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Oct 26 14:47:19 2010
@@ -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)