Issue #25004: Merge 3.5 into 3.6

2 files changed, 5 insertions, 1 deletions

diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index 3de84e8bef..0f25742c48 100644
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -731,7 +731,10 @@ class LargeMmapTests(unittest.TestCase):
             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
index ba6cbbfa11..bc97dba945 100644
--- 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