cpython (merge 3.5 -> default): Merge typo fixes from 3.5
https://hg.python.org/cpython/rev/9a2cbf3c4324 changeset: 99605:9a2cbf3c4324 parent: 99603:2bd893405c62 parent: 99604:e4db4b3b1547 user: Martin Panter <vadmium+py@gmail.com> date: Thu Dec 17 10:20:21 2015 +0000 summary: Merge typo fixes from 3.5 files: Lib/test/string_tests.py | 2 +- Lib/test/test_zipfile64.py | 2 +- Python/fileutils.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -685,7 +685,7 @@ class CommonTest(BaseTest): - # This testcase contains test that can be used in all + # This testcase contains tests that can be used in all # stringlike classes. Currently this is str, unicode # UserString and the string module. diff --git a/Lib/test/test_zipfile64.py b/Lib/test/test_zipfile64.py --- a/Lib/test/test_zipfile64.py +++ b/Lib/test/test_zipfile64.py @@ -3,7 +3,7 @@ # from test_zipfile from test import support -# XXX(nnorwitz): disable this test by looking for extra largfile resource +# XXX(nnorwitz): disable this test by looking for extralargefile resource, # which doesn't exist. This test takes over 30 minutes to run in general # and requires more disk space than most of the buildbots. support.requires( diff --git a/Python/fileutils.c b/Python/fileutils.c --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -599,7 +599,7 @@ On Windows, use GetFileType() and GetFileInformationByHandle() which support files larger than 2 GB. fstat() may fail with EOVERFLOW on files larger - than 2 GB because the file size type is an signed 32-bit integer: see issue + than 2 GB because the file size type is a signed 32-bit integer: see issue #23152. On Windows, set the last Windows error and return nonzero on error. On @@ -669,7 +669,7 @@ On Windows, use GetFileType() and GetFileInformationByHandle() which support files larger than 2 GB. fstat() may fail with EOVERFLOW on files larger - than 2 GB because the file size type is an signed 32-bit integer: see issue + than 2 GB because the file size type is a signed 32-bit integer: see issue #23152. Raise an exception and return -1 on error. On Windows, set the last Windows -- Repository URL: https://hg.python.org/cpython
participants (1)
-
martin.panter