[Python-checkins] Make sure file object is close if socket.create_connection fails (GH-11334)
Miss Islington (bot)
webhook-mailer at python.org
Fri Dec 28 21:12:44 EST 2018
https://github.com/python/cpython/commit/0f756f7f564836d4f64e8f144e51f7f55346b919
commit: 0f756f7f564836d4f64e8f144e51f7f55346b919
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-12-28T18:12:39-08:00
summary:
Make sure file object is close if socket.create_connection fails (GH-11334)
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 9b9d11368cb7..82b89fcbafa6 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -5717,11 +5717,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()
More information about the Python-checkins
mailing list