]> granicus.if.org Git - python/commitdiff
Make sure file object is close if socket.create_connection fails (GH-11334)
authorPablo Galindo <Pablogsal@gmail.com>
Sat, 29 Dec 2018 01:42:16 +0000 (01:42 +0000)
committerGitHub <noreply@github.com>
Sat, 29 Dec 2018 01:42:16 +0000 (01:42 +0000)
The problem affects _testWithTimeoutTriggeredSend in test_socket.py.

Lib/test/test_socket.py

index 36d3d5ed12b3b785e34bf6340a256915d60dc612..7c5167d85033cf96c1208cddde904959151869a6 100644 (file)
@@ -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()