[Python-checkins] r88693 - in python/branches/release27-maint: Lib/test/test_telnetlib.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Tue Mar  1 01:48:40 2011
New Revision: 88693

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/test_telnetlib.py

Modified: python/branches/release27-maint/Lib/test/test_telnetlib.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_telnetlib.py	(original)
+++ python/branches/release27-maint/Lib/test/test_telnetlib.py	Tue Mar  1 01:48:40 2011
@@ -36,9 +36,10 @@
                 data = data[written:]
     except socket.timeout:
         pass
+    else:
+        conn.close()
     finally:
         serv.close()
-        conn.close()
         evt.set()
 
 class GeneralTests(TestCase):