summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-03-01 00:48:40 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2011-03-01 00:48:40 +0000
commit2262766de23d980de1edd8603a299ee6b5dcde70 (patch)
tree02a895b117b8109bc86c53ed98708f546e991e7e
parent370d85cee417e24447e28f00b36716c7479f343c (diff)
downloadcpython-git-2262766de23d980de1edd8603a299ee6b5dcde70.tar.gz
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 ........
-rw-r--r--Lib/test/test_telnetlib.py3
1 files changed, 2 insertions, 1 deletions
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):