From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 13 Sep 2017 13:09:44 +0000 (-0700)
Subject: [3.6] bpo-31448, test_poplib: Fix ResourceWarning (GH-3542) (#3543)
X-Git-Tag: v3.6.3rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=769ddb075ac3a840d473930a12a5b72bfbab366f;p=thirdparty%2FPython%2Fcpython.git

[3.6] bpo-31448, test_poplib: Fix ResourceWarning (GH-3542) (#3543)

Call POP3.close(), don't close close directly the sock attribute.
(cherry picked from commit d165e14e29b45a22450263722f5c2c386c3a748a)
---

diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py
index e5b16dc98a41..6bc973978085 100644
--- a/Lib/test/test_poplib.py
+++ b/Lib/test/test_poplib.py
@@ -483,7 +483,7 @@ class TestTimeouts(TestCase):
         finally:
             socket.setdefaulttimeout(None)
         self.assertEqual(pop.sock.gettimeout(), 30)
-        pop.sock.close()
+        pop.close()
 
     def testTimeoutNone(self):
         self.assertIsNone(socket.getdefaulttimeout())
@@ -493,12 +493,12 @@ class TestTimeouts(TestCase):
         finally:
             socket.setdefaulttimeout(None)
         self.assertIsNone(pop.sock.gettimeout())
-        pop.sock.close()
+        pop.close()
 
     def testTimeoutValue(self):
         pop = poplib.POP3(HOST, self.port, timeout=30)
         self.assertEqual(pop.sock.gettimeout(), 30)
-        pop.sock.close()
+        pop.close()
 
 
 def test_main():