From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 1 Mar 2011 00:48:40 +0000 (+0000)
Subject: Merged revisions 88691 via svnmerge from
X-Git-Tag: v2.7.2rc1~293
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2262766de23d980de1edd8603a299ee6b5dcde70;p=python

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 321e052fa9..e40c1fe421 100644
--- a/Lib/test/test_telnetlib.py
+++ b/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):