Moar resource leak patchage.

src/ZODB/tests/testFileStorage.py

@@ -234,20 +234,19 @@ class FileStorageTests(
         self.open()
 
         # Open .fs directly, and damage content.
-        f = open('FileStorageTests.fs', 'r+b')
-        f.seek(0, 2)
-        pos2 = f.tell() - 8
-        f.seek(pos2)
-        tlen2 = U64(f.read(8))  # length-8 of the last transaction
-        pos1 = pos2 - tlen2 + 8 # skip over the tid at the start
-        f.seek(pos1)
-        tlen1 = U64(f.read(8))  # should be redundant length-8
-        self.assertEqual(tlen1, tlen2)  # verify that it is redundant
-
-        # Now damage the second copy.
-        f.seek(pos2)
-        f.write(p64(tlen2 - 1))
-        f.close()
+        with open('FileStorageTests.fs', 'r+b') as f:
+            f.seek(0, 2)
+            pos2 = f.tell() - 8
+            f.seek(pos2)
+            tlen2 = U64(f.read(8))  # length-8 of the last transaction
+            pos1 = pos2 - tlen2 + 8 # skip over the tid at the start
+            f.seek(pos1)
+            tlen1 = U64(f.read(8))  # should be redundant length-8
+            self.assertEqual(tlen1, tlen2)  # verify that it is redundant
+
+            # Now damage the second copy.
+            f.seek(pos2)
+            f.write(p64(tlen2 - 1))
 
         # Try to pack.  This used to yield
         #     NameError: global name 's' is not defined

src/ZODB/tests/testZODB.py

@@ -71,14 +71,13 @@ class ZODBTests(ZODB.tests.util.TestCase):
         assert len(ob) > 10, 'Insufficient test data'
         try:
             import tempfile
-            f = tempfile.TemporaryFile()
-            ob._p_jar.exportFile(ob._p_oid, f)
-            assert f.tell() > 0, 'Did not export correctly'
-            f.seek(0)
-            new_ob = ob._p_jar.importFile(f)
-            self.assertEqual(new_ob, ob)
-            root['dup'] = new_ob
-            f.close()
+            with tempfile.TemporaryFile(prefix="DUP") as f:
+                ob._p_jar.exportFile(ob._p_oid, f)
+                assert f.tell() > 0, 'Did not export correctly'
+                f.seek(0)
+                new_ob = ob._p_jar.importFile(f)
+                self.assertEqual(new_ob, ob)
+                root['dup'] = new_ob
             if abort_it:
                 transaction.abort()
             else: