[Python-checkins] r85846 - in python/branches/py3k: Lib/telnetlib.py Misc/NEWS
r.david.murray
python-checkins at python.org
Tue Oct 26 14:42:25 CEST 2010
Author: r.david.murray
Date: Tue Oct 26 14:42:24 2010
New Revision: 85846
Log:
#7761: fix telnetlib.interact failures on Windows.
Modified:
python/branches/py3k/Lib/telnetlib.py
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/telnetlib.py
==============================================================================
--- python/branches/py3k/Lib/telnetlib.py (original)
+++ python/branches/py3k/Lib/telnetlib.py Tue Oct 26 14:42:24 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/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Tue Oct 26 14:42:24 2010
@@ -51,6 +51,8 @@
Library
-------
+- #7761: telnetlib.interact failures on Windows fixed.
+
- logging: Added style option to Formatter to allow %, {} or $-formatting.
- Issue #5178: Added tempfile.TemporaryDirectory class that can be used
More information about the Python-checkins
mailing list