From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Sat, 22 May 2021 20:55:17 +0000 (-0700) Subject: Remove duplicate words in docs. (GH-26167) (GH-26296) X-Git-Tag: v3.10.0b2~50 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37da1f09a277d9e29f655a87174e37453b6e3211;p=thirdparty%2FPython%2Fcpython.git Remove duplicate words in docs. (GH-26167) (GH-26296) (cherry picked from commit b06ed1d883cd79c920c514d8a1f4643cf93dc5e0) Co-authored-by: Mariusz Felisiak --- diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 29c68ed72c6d..afb5da48d256 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -712,7 +712,7 @@ Glossary On Unix, it is the encoding of the LC_CTYPE locale. It can be set with ``locale.setlocale(locale.LC_CTYPE, new_locale)``. - On Windows, it is is the ANSI code page (ex: ``cp1252``). + On Windows, it is the ANSI code page (ex: ``cp1252``). ``locale.getpreferredencoding(False)`` can be used to get the locale encoding. diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst index 466d95941468..137fe500c956 100644 --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -595,8 +595,8 @@ Utilites and Decorators A :keyword:`class` decorator specifically for enumerations. It replaces the :meth:`__repr__` method with one that shows *module_name*.*member_name*. It - also injects the members, and their aliases, into the the global namespace - they were defined in. + also injects the members, and their aliases, into the global namespace they + were defined in. .. decorator:: property diff --git a/Doc/library/fileinput.rst b/Doc/library/fileinput.rst index 819640045cad..3880ed3d2bfc 100644 --- a/Doc/library/fileinput.rst +++ b/Doc/library/fileinput.rst @@ -205,7 +205,7 @@ The two following opening hooks are provided by this module: modules. If the filename extension is not ``'.gz'`` or ``'.bz2'``, the file is opened normally (ie, using :func:`open` without any decompression). - The *encoding* and *errors* values are passed to to :class:`io.TextIOWrapper` + The *encoding* and *errors* values are passed to :class:`io.TextIOWrapper` for compressed files and open for normal files. Usage example: ``fi = fileinput.FileInput(openhook=fileinput.hook_compressed, encoding="utf-8")`` diff --git a/Doc/library/types.rst b/Doc/library/types.rst index b3fac293ecc9..2dfc0f2fcadf 100644 --- a/Doc/library/types.rst +++ b/Doc/library/types.rst @@ -278,8 +278,8 @@ Standard names are defined for the following types: .. attribute:: __spec__ - A record of the the module's import-system-related state. Expected to be - an instance of :class:`importlib.machinery.ModuleSpec`. + A record of the module's import-system-related state. Expected to be an + instance of :class:`importlib.machinery.ModuleSpec`. .. versionadded:: 3.4 diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst index 1604731b99e3..f1c0757c510f 100644 --- a/Doc/library/unittest.mock.rst +++ b/Doc/library/unittest.mock.rst @@ -328,8 +328,8 @@ the *new_callable* argument to :func:`patch`. .. method:: assert_called_once_with(*args, **kwargs) - Assert that the mock was called exactly once and that that call was - with the specified arguments. + Assert that the mock was called exactly once and that call was with the + specified arguments. >>> mock = Mock(return_value=None) >>> mock('foo', bar='baz') diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst index 2697cf9b6fe8..edc33e0df65a 100644 --- a/Doc/whatsnew/3.10.rst +++ b/Doc/whatsnew/3.10.rst @@ -1574,7 +1574,7 @@ Deprecated Python 3.12. Use :meth:`pathlib.Path.hardlink_to` instead. (Contributed by Barney Gale in :issue:`39950`.) -* ``cgi.log()`` is deprecated and slated for for removal in Python 3.12. +* ``cgi.log()`` is deprecated and slated for removal in Python 3.12. (Contributed by Inada Naoki in :issue:`41139`.)