From: Brian Curtin <brian.curtin@gmail.com>
Date: Thu, 4 Nov 2010 03:49:29 +0000 (+0000)
Subject: Merged revisions 86151 via svnmerge from
X-Git-Tag: v3.1.3rc1~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f8ed9419608fb1c69ba3011fb956cc854140b94;p=python

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

........
  r86151 | brian.curtin | 2010-11-03 22:41:43 -0500 (Wed, 03 Nov 2010) | 3 lines

  Fix three ResourceWarnings.
  Mimic the clientTearDown from ThreadedTCPSocketTest, closing the socket.
........
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index a467e0d1bd..98ba4df15b 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -177,6 +177,11 @@ class ThreadedUDPSocketTest(SocketUDPTest, ThreadableTest):
     def clientSetUp(self):
         self.cli = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
+    def clientTearDown(self):
+        self.cli.close()
+        self.cli = None
+        ThreadableTest.clientTearDown(self)
+
 class SocketConnectedTest(ThreadedTCPSocketTest):
     """Socket tests for client-server connection.