[Python-checkins] cpython (merge 3.5 -> default): Issue #25004: Merge 3.5 into 3.6
martin.panter
python-checkins at python.org
Mon Sep 7 06:18:02 CEST 2015
https://hg.python.org/cpython/rev/6c9159661aa8
changeset: 97724:6c9159661aa8
parent: 97723:48f1e9a47301
parent: 97722:fd4bf05b32ba
user: Martin Panter <vadmium>
date: Mon Sep 07 04:07:06 2015 +0000
summary:
Issue #25004: Merge 3.5 into 3.6
files:
Lib/test/test_mmap.py | 5 ++++-
Misc/ACKS | 1 +
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
--- 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
diff --git a/Misc/ACKS b/Misc/ACKS
--- 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
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list