From b637680f7e4e23c59c12dd5f95c78b75a51e75f4 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 15 Mar 2011 17:38:22 -0400 Subject: Properly close a file in test_os. --- Lib/test/test_os.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 8161d9b..e40f763 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -1528,18 +1528,16 @@ class TestSendfile(unittest.TestCase): def test_trailers(self): TESTFN2 = support.TESTFN + "2" - f = open(TESTFN2, 'wb') - f.write(b"abcde") - f.close() - f = open(TESTFN2, 'rb') - try: - os.sendfile(self.sockno, f.fileno(), 0, 4096, trailers=[b"12345"]) + with open(TESTFN2, 'wb') as f: + f.write(b"abcde") + with open(TESTFN2, 'rb')as f: + self.addCleanup(os.remove, TESTFN2) + os.sendfile(self.sockno, f.fileno(), 0, 4096, + trailers=[b"12345"]) self.client.close() self.server.wait() data = self.server.handler_instance.get_data() self.assertEqual(data, b"abcde12345") - finally: - os.remove(TESTFN2) if hasattr(os, "SF_NODISKIO"): def test_flags(self): -- cgit v0.12