Hopefully this will fix the spurious failures of test_mailbox.py that I'm

experiencing.  (This code and mailbox.py itself are full of calls to file()
that should be calls to open() -- but I'm not fixing those.)

diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index 6044071d83ad7c53ec9ccee7819d37a994032f8b..18b966fa68aacf419ec9e8841f501cd02c32419b 100644 (file)
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -577,14 +577,18 @@ class TestMaildir(TestMailbox):
         # Remove old files from 'tmp'
         foo_path = os.path.join(self._path, 'tmp', 'foo')
         bar_path = os.path.join(self._path, 'tmp', 'bar')
-        file(foo_path, 'w').close()
-        file(bar_path, 'w').close()
+        f = open(foo_path, 'w')
+        f.write("@")
+        f.close()
+        f = open(bar_path, 'w')
+        f.write("@")
+        f.close()
         self._box.clean()
         self.assert_(os.path.exists(foo_path))
         self.assert_(os.path.exists(bar_path))
         foo_stat = os.stat(foo_path)
-        os.utime(os.path.join(foo_path), (time.time() - 129600 - 2,
-                                          foo_stat.st_mtime))
+        os.utime(foo_path, (time.time() - 129600 - 2,
+                            foo_stat.st_mtime))
         self._box.clean()
         self.assert_(not os.path.exists(foo_path))
         self.assert_(os.path.exists(bar_path))