Issue #25004: Merge 3.5 into 3.6

2015-09-07 04:07:06 +00:00 · 2015-09-07 04:07:06 +00:00 · 1b8be1fbe5
parent 015e3f65bc da19767b86
commit 1b8be1fbe5
2 changed files with 5 additions and 1 deletions
--- 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

--- 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