[Python-checkins] Make sure file object is close if socket.create_connection fails (GH-11334) (GH-11351)

[Ned Deily]

https://github.com/python/cpython/commit/dc020cc9800ae85f3a241b89ff5fcbc35ba39406
commit: dc020cc9800ae85f3a241b89ff5fcbc35ba39406
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Ned Deily <nad at python.org>
date: 2019-01-17T20:02:43-05:00
summary:

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

The problem affects _testWithTimeoutTriggeredSend in test_socket.py.
(cherry picked from commit 1f511e1af060e98fb789319a96076c06e7f98135)

Co-authored-by: Pablo Galindo <Pablogsal at gmail.com>

files:
M Lib/test/test_socket.py

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 56adec18c636..95c3938ac234 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -5363,11 +5363,10 @@ def testWithTimeout(self):
 
     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()