python · vstinner · Oct 17, 2018 · vstinner · Oct 17, 2018 · matrixise
diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
+            self.assertEqual(f.tell(), size)
+
+        with self.open(TESTFN, "rb") as f:
+            self.assertEqual(f.read(size), size)
diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
+        with self.open(TESTFN, "wb") as f:
+            b = b'x' * size
+            self.assertEqual(f.write(b), size)
+            self.assertEqual(f.tell(), size)
diff --git a/Include/fileutils.h b/Include/fileutils.h
@@ -19,6 +19,17 @@ PyAPI_FUNC(char*) Py_EncodeLocale(

 PyAPI_FUNC(PyObject *) _Py_device_encoding(int);

+#if defined(MS_WINDOWS) || defined(__APPLE__)
+/* On Windows, the count parameter of read() is an int
+   See issue #24658
diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
+        with self.open(TESTFN, "wb") as f:
+            b = b'x' * size
+            self.assertEqual(f.write(b), size)
+            self.assertEqual(f.tell(), size)
diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
@@ -45,6 +45,20 @@ def tearDownClass(cls):
            raise cls.failureException('File was not truncated by opening '
                                       'with mode "wb"')

+    @bigmemtest(size=_2G + 1024 * 1024, memuse=2)
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
-    if (size > INT_MAX)
-        size = INT_MAX;
-#endif
+    if (size > _PY_READ_MAX) {
diff --git a/Include/fileutils.h b/Include/fileutils.h
@@ -21,7 +21,7 @@ PyAPI_FUNC(PyObject *) _Py_device_encoding(int);

 #if defined(MS_WINDOWS) || defined(__APPLE__)
 /* On Windows, the count parameter of read() is an int
-   See issue #24658
+   Add the support of MacOS with the issue #24658
diff --git a/.travis.yml b/.travis.yml
@@ -81,7 +81,7 @@ before_script:

 script:
  # `-r -w` implicitly provided through `make buildbottest`.
-  - make buildbottest TESTOPTS="-j4"
+  - make buildbottest TESTOPTS="-j4 -v test_largefile"
diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
@@ -5,7 +5,7 @@
 import stat
 import sys
 import unittest
-from test.support import TESTFN, requires, unlink
+from test.support import TESTFN, requires, unlink, bigmemtest, _2G
diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
@@ -45,6 +45,25 @@ def tearDownClass(cls):
            raise cls.failureException('File was not truncated by opening '
                                       'with mode "wb"')

+    def test_large_reads_writes(self):
+        # see issue #24658
+        requires('largefile',