Issue #25004: Merge 3.4 into 3.5

Martin Panter · Martin Panter · commit da19767b86dc · 2015-09-07T04:04:40.000Z
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
@@ -731,7 +731,10 @@ def _make_test_file(self, num_zeroes, tail):
             f.write(tail)
             f.flush()
         except (OSError, OverflowError):
-            f.close()
+            try:
+                f.close()
+            except (OSError, OverflowError):
+                pass
             raise unittest.SkipTest("filesystem does not have largefile support")
         return f
 
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -103,6 +103,7 @@ Mike Bayer
 Samuel L. Bayer
 Donald Beaudry
 David Beazley
+John Beck
 Ingolf Becker
 Neal Becker
 Robin Becker
