Index: Lib/test/test_marshal.py
===================================================================
--- Lib/test/test_marshal.py	(revision 78212)
+++ Lib/test/test_marshal.py	(working copy)
@@ -16,8 +16,10 @@
                 s = marshal.dumps(expected)
                 got = marshal.loads(s)
                 self.assertEqual(expected, got)
-                marshal.dump(expected, file(test_support.TESTFN, "wb"))
-                got = marshal.load(file(test_support.TESTFN, "rb"))
+                with file(test_support.TESTFN, "wb") as fobj:
+                    marshal.dump(expected, fobj)
+                with file(test_support.TESTFN, "rb") as fobj:
+                    got = marshal.load(fobj)
                 self.assertEqual(expected, got)
             n = n >> 1
         os.unlink(test_support.TESTFN)
@@ -51,8 +53,10 @@
             new = marshal.loads(marshal.dumps(b))
             self.assertEqual(b, new)
             self.assertEqual(type(b), type(new))
-            marshal.dump(b, file(test_support.TESTFN, "wb"))
-            new = marshal.load(file(test_support.TESTFN, "rb"))
+            with file(test_support.TESTFN, "wb") as fobj:
+                marshal.dump(b, fobj)
+            with file(test_support.TESTFN, "rb") as fobj:
+                new = marshal.load(fobj)
             self.assertEqual(b, new)
             self.assertEqual(type(b), type(new))
 
@@ -67,8 +71,10 @@
                 s = marshal.dumps(f)
                 got = marshal.loads(s)
                 self.assertEqual(f, got)
-                marshal.dump(f, file(test_support.TESTFN, "wb"))
-                got = marshal.load(file(test_support.TESTFN, "rb"))
+                with file(test_support.TESTFN, "wb") as fobj:
+                    marshal.dump(f, fobj)
+                with file(test_support.TESTFN, "rb") as fobj:
+                    got = marshal.load(fobj)
                 self.assertEqual(f, got)
             n /= 123.4567
 
@@ -94,12 +100,16 @@
                 got = marshal.loads(s)
                 self.assertEqual(f, got)
 
-                marshal.dump(f, file(test_support.TESTFN, "wb"))
-                got = marshal.load(file(test_support.TESTFN, "rb"))
+                with file(test_support.TESTFN, "wb") as fobj:
+                    marshal.dump(f, fobj)
+                with file(test_support.TESTFN, "rb") as fobj:
+                    got = marshal.load(fobj)
                 self.assertEqual(f, got)
 
-                marshal.dump(f, file(test_support.TESTFN, "wb"), 1)
-                got = marshal.load(file(test_support.TESTFN, "rb"))
+                with file(test_support.TESTFN, "wb") as fobj:
+                    marshal.dump(f, fobj, 1)
+                with file(test_support.TESTFN, "rb") as fobj:
+                    got = marshal.load(fobj)
                 self.assertEqual(f, got)
             n *= 123.4567
         os.unlink(test_support.TESTFN)
@@ -110,8 +120,10 @@
             new = marshal.loads(marshal.dumps(s))
             self.assertEqual(s, new)
             self.assertEqual(type(s), type(new))
-            marshal.dump(s, file(test_support.TESTFN, "wb"))
-            new = marshal.load(file(test_support.TESTFN, "rb"))
+            with file(test_support.TESTFN, "wb") as fobj:
+                marshal.dump(s, fobj)
+            with file(test_support.TESTFN, "rb") as fobj:
+                new = marshal.load(fobj)
             self.assertEqual(s, new)
             self.assertEqual(type(s), type(new))
         os.unlink(test_support.TESTFN)
@@ -121,8 +133,10 @@
             new = marshal.loads(marshal.dumps(s))
             self.assertEqual(s, new)
             self.assertEqual(type(s), type(new))
-            marshal.dump(s, file(test_support.TESTFN, "wb"))
-            new = marshal.load(file(test_support.TESTFN, "rb"))
+            with file(test_support.TESTFN, "wb") as fobj:
+                marshal.dump(s, fobj)
+            with file(test_support.TESTFN, "rb") as fobj:
+                new = marshal.load(fobj)
             self.assertEqual(s, new)
             self.assertEqual(type(s), type(new))
         os.unlink(test_support.TESTFN)
@@ -132,8 +146,10 @@
             b = buffer(s)
             new = marshal.loads(marshal.dumps(b))
             self.assertEqual(s, new)
-            marshal.dump(b, file(test_support.TESTFN, "wb"))
-            new = marshal.load(file(test_support.TESTFN, "rb"))
+            with file(test_support.TESTFN, "wb") as fobj:
+                marshal.dump(b, fobj)
+            with file(test_support.TESTFN, "rb") as fobj:
+                new = marshal.load(fobj)
             self.assertEqual(s, new)
         os.unlink(test_support.TESTFN)
 
@@ -161,8 +177,10 @@
     def test_dict(self):
         new = marshal.loads(marshal.dumps(self.d))
         self.assertEqual(self.d, new)
-        marshal.dump(self.d, file(test_support.TESTFN, "wb"))
-        new = marshal.load(file(test_support.TESTFN, "rb"))
+        with file(test_support.TESTFN, "wb") as fobj:
+            marshal.dump(self.d, fobj)
+        with file(test_support.TESTFN, "rb") as fobj:
+            new = marshal.load(fobj)
         self.assertEqual(self.d, new)
         os.unlink(test_support.TESTFN)
 
@@ -170,8 +188,10 @@
         lst = self.d.items()
         new = marshal.loads(marshal.dumps(lst))
         self.assertEqual(lst, new)
-        marshal.dump(lst, file(test_support.TESTFN, "wb"))
-        new = marshal.load(file(test_support.TESTFN, "rb"))
+        with file(test_support.TESTFN, "wb") as fobj:
+            marshal.dump(lst, fobj)
+        with file(test_support.TESTFN, "rb") as fobj:
+            new = marshal.load(fobj)
         self.assertEqual(lst, new)
         os.unlink(test_support.TESTFN)
 
@@ -179,8 +199,10 @@
         t = tuple(self.d.keys())
         new = marshal.loads(marshal.dumps(t))
         self.assertEqual(t, new)
-        marshal.dump(t, file(test_support.TESTFN, "wb"))
-        new = marshal.load(file(test_support.TESTFN, "rb"))
+        with file(test_support.TESTFN, "wb") as fobj:
+            marshal.dump(t, fobj)
+        with file(test_support.TESTFN, "rb") as fobj:
+            new = marshal.load(fobj)
         self.assertEqual(t, new)
         os.unlink(test_support.TESTFN)
 
@@ -191,8 +213,10 @@
             self.assertEqual(t, new)
             self.assertTrue(isinstance(new, constructor))
             self.assertNotEqual(id(t), id(new))
-            marshal.dump(t, file(test_support.TESTFN, "wb"))
-            new = marshal.load(file(test_support.TESTFN, "rb"))
+            with file(test_support.TESTFN, "wb") as fobj:
+                marshal.dump(t, fobj)
+            with file(test_support.TESTFN, "rb") as fobj:
+                new = marshal.load(fobj)
             self.assertEqual(t, new)
             os.unlink(test_support.TESTFN)