From: Pablo Galindo <Pablogsal@gmail.com>
Date: Sat, 29 Dec 2018 01:42:16 +0000 (+0000)
Subject: Make sure file object is close if socket.create_connection fails (GH-11334)
X-Git-Tag: v3.8.0a1~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f511e1af060e98fb789319a96076c06e7f98135;p=thirdparty%2FPython%2Fcpython.git

Make sure file object is close if socket.create_connection fails (GH-11334)

The problem affects _testWithTimeoutTriggeredSend in test_socket.py.
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 36d3d5ed12b3..7c5167d85033 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -5787,11 +5787,10 @@ class SendfileUsingSendTest(ThreadedTCPSocketTest):
 
     def _testWithTimeoutTriggeredSend(self):
         address = self.serv.getsockname()
-        file = open(support.TESTFN, 'rb')
-        with socket.create_connection(address, timeout=0.01) as sock, \
-                file as file:
-            meth = self.meth_from_sock(sock)
-            self.assertRaises(socket.timeout, meth, file)
+        with open(support.TESTFN, 'rb') as file:
+            with socket.create_connection(address, timeout=0.01) as sock:
+                meth = self.meth_from_sock(sock)
+                self.assertRaises(socket.timeout, meth, file)
 
     def testWithTimeoutTriggeredSend(self):
         conn = self.accept_conn()