Merged revisions 88691 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88691 | antoine.pitrou | 2011-03-01 01:41:10 +0100 (mar., 01 mars 2011) | 3 lines

  Endly, fix UnboundLocalError in telnetlib
........

Lib/test/test_telnetlib.py

@@ -36,9 +36,10 @@ def server(evt, serv, dataq=None):
                 data = data[written:]
     except socket.timeout:
         pass
+    else:
+        conn.close()
     finally:
         serv.close()
-        conn.close()
         evt.set()
 
 class GeneralTests(TestCase):