[Python-checkins] cpython (merge 3.6 -> default): Issue #26926: Merge 3.6

Thu Nov 17 03:23:16 EST 2016

https://hg.python.org/cpython/rev/878f91b4ad19
changeset: 105175:878f91b4ad19
parent: 105173:99d69fd1b24e
parent: 105174:d616304b82aa
user: Xavier de Gaye <xdegaye at users.sourceforge.net>
date: Thu Nov 17 09:22:43 2016 +0100
summary:
 Issue #26926: Merge 3.6
files:
 Lib/test/test_io.py | 5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -350,7 +350,10 @@
 def large_file_ops(self, f):
 assert f.readable()
 assert f.writable()
- self.assertEqual(f.seek(self.LARGE), self.LARGE)
+ try:
+ self.assertEqual(f.seek(self.LARGE), self.LARGE)
+ except (OverflowError, ValueError):
+ self.skipTest("no largefile support")
 self.assertEqual(f.tell(), self.LARGE)
 self.assertEqual(f.write(b"xxx"), 3)
 self.assertEqual(f.tell(), self.LARGE + 3)
-- 
Repository URL: https://hg.python.org/cpython
