diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-10-26 12:47:19 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-10-26 12:47:19 (GMT) |
| commit | 35e982f770e9898cf72ca7a434d892c3396a2734 (patch) | |
| tree | f4dd1018a552804c49fc505eb9c997f31212cdfa /Lib | |
| parent | acc62be8aab359b7fa8875677356f98b396d8506 (diff) | |
| download | cpython-35e982f770e9898cf72ca7a434d892c3396a2734.zip cpython-35e982f770e9898cf72ca7a434d892c3396a2734.tar.gz cpython-35e982f770e9898cf72ca7a434d892c3396a2734.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/telnetlib.py | 4 |
1 files changed, 2 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() |