commit e6700e9a0435df5de59eed27fa072caf320e7ebd
author Georg Brandl <georg@python.org> Thu Aug 13 08:39:33 2009 +0000
committer Georg Brandl <georg@python.org> Thu Aug 13 08:39:33 2009 +0000
tree fad4a06f18cc3ad533726cfe4c43e99e9a02c7ae
parent 01a30523f9782f9e8b8f49efc3b2a703b94394f3

Merged revisions 74217,74224 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r74217 | jack.diederich | 2009-07-27 00:23:04 +0200 (Mo, 27 Jul 2009) | 1 line

  - fix issue #6106, Telnet.process_rawq default handling of WILL/WONT/DO/DONT
........
  r74224 | jack.diederich | 2009-07-27 11:03:14 +0200 (Mo, 27 Jul 2009) | 1 line

  - belated ACK for issue #6106
........

Lib/telnetlib.py

diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py
index 11e1a65..5258c8a 100644
--- a/Lib/telnetlib.py
+++ b/Lib/telnetlib.py
@@ -459,7 +459,7 @@
                             # unless we did a WILL/DO before.
                             self.msg('IAC %d not recognized' % ord(c))
                 elif len(self.iacseq) == 2:
-                    cmd = self.iacseq[1]
+                    cmd = self.iacseq[1:2]
                     self.iacseq = b''
                     opt = c
                     if cmd in (DO, DONT):