From: Brian Curtin <brian.curtin@gmail.com>
Date: Sat, 6 Nov 2010 01:37:00 +0000 (+0000)
Subject: Merged revisions 86228 via svnmerge from
X-Git-Tag: v2.7.1rc1~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c6d438a173f387b07c3d8ac615d30536d496411;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 86228 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86228 | brian.curtin | 2010-11-05 20:30:41 -0500 (Fri, 05 Nov 2010) | 2 lines

  Clear up ResourceWarnings
........
---

diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py
index fd5c6f7c3c53..321e052fa9da 100644
--- a/Lib/test/test_telnetlib.py
+++ b/Lib/test/test_telnetlib.py
@@ -38,6 +38,7 @@ def server(evt, serv, dataq=None):
         pass
     finally:
         serv.close()
+        conn.close()
         evt.set()
 
 class GeneralTests(TestCase):