commit 1b8be1fbe5554ff7d145fd7596b07940249ee53f
author Martin Panter <vadmium> Mon Sep 07 04:07:06 2015 +0000
committer Martin Panter <vadmium> Mon Sep 07 04:07:06 2015 +0000
tree 77511cbc81db4185080247afc80d096f1f087b82
parent 015e3f65bcd0513f1a0d62f1fbddd48edc6af20d
parent da19767b86dcee5810ad8c77a05811be041d7c89

Issue #25004: Merge 3.5 into 3.6

Lib/test/test_mmap.py

diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index 3de84e8..0f25742 100644
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -731,7 +731,10 @@
             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

diff --git a/Misc/ACKS b/Misc/ACKS
index ba6cbbf..bc97dba 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -103,6 +103,7 @@
 Samuel L. Bayer
 Donald Beaudry
 David Beazley
+John Beck
 Ingolf Becker
 Neal Becker
 Robin Becker