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

diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py
index 843daf15850966eddaf7fc4c28c42df6d176ce5a..a78b938b86fb00bfe31da27b42b07acb51df971a 100644 (file)
--- a/Lib/test/test_telnetlib.py
+++ b/Lib/test/test_telnetlib.py
@@ -17,9 +17,10 @@ def server(evt, serv):
         conn, addr = serv.accept()
     except socket.timeout:
         pass
+    else:
+        conn.close()
     finally:
         serv.close()
-        conn.close()
         evt.set()
 
 class GeneralTests(TestCase):