From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Wed, 28 Mar 2018 13:23:32 +0000 (-0700) Subject: s/the the/the/ (GH-6287) X-Git-Tag: v3.7.0b3~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6cb556ffa6cbd731ef147eb89fe262a0c738f8b1;p=thirdparty%2FPython%2Fcpython.git s/the the/the/ (GH-6287) (cherry picked from commit 40a536be5337d3723285d597e2906394b26816a5) Co-authored-by: INADA Naoki --- diff --git a/Doc/glossary.rst b/Doc/glossary.rst index dcfe086b38b1..2eab00314682 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -463,7 +463,7 @@ Glossary hash-based pyc - A bytecode cache file that uses the the hash rather than the last-modified + A bytecode cache file that uses the hash rather than the last-modified time of the corresponding source file to determine its validity. See :ref:`pyc-invalidation`. diff --git a/Misc/HISTORY b/Misc/HISTORY index 26c7f2074d7b..d4a1b16a7c04 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -1389,7 +1389,7 @@ Release date: 2014-09-22 Core and Builtins ----------------- -- Issue #22258: Fix the the internal function set_inheritable() on Illumos. +- Issue #22258: Fix the internal function set_inheritable() on Illumos. This platform exposes the function ``ioctl(FIOCLEX)``, but calling it fails with errno is ENOTTY: "Inappropriate ioctl for device". set_inheritable() now falls back to the slower ``fcntl()`` (``F_GETFD`` and then ``F_SETFD``).