Issue #25004: Merge 3.5 into 3.6

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
 

Misc/ACKS

@@ -103,6 +103,7 @@ Mike Bayer
 Samuel L. Bayer
 Donald Beaudry
 David Beazley
+John Beck
 Ingolf Becker
 Neal Becker
 Robin Becker