From: Martin Panter Date: Thu, 8 Sep 2016 05:39:59 +0000 (+0000) Subject: Issue #27993: Fix problems with the plural “objects” in docs and comments X-Git-Tag: v2.7.13rc1~156 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba5480b6565e00b4672ed276770623faa1312877;p=python Issue #27993: Fix problems with the plural “objects” in docs and comments --- diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst index bdc699f6b9..af3489597d 100644 --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@ -181,7 +181,7 @@ The following sections describe how each of these are used. prog ^^^^ -By default, :class:`ArgumentParser` objects uses ``sys.argv[0]`` to determine +By default, :class:`ArgumentParser` objects use ``sys.argv[0]`` to determine how to display the name of the program in help messages. This default is almost always desirable because it will make the help messages match how the program was invoked on the command line. For example, consider a file named @@ -512,7 +512,7 @@ conflict_handler ^^^^^^^^^^^^^^^^ :class:`ArgumentParser` objects do not allow two actions with the same option -string. By default, :class:`ArgumentParser` objects raises an exception if an +string. By default, :class:`ArgumentParser` objects raise an exception if an attempt is made to create an argument with an option string that is already in use:: diff --git a/Doc/library/weakref.rst b/Doc/library/weakref.rst index e5a99ea422..afbd6113b8 100644 --- a/Doc/library/weakref.rst +++ b/Doc/library/weakref.rst @@ -328,7 +328,7 @@ the referent is accessed:: Example ------- -This simple example shows how an application can use objects IDs to retrieve +This simple example shows how an application can use object IDs to retrieve objects that it has seen before. The IDs of the objects can then be used in other data structures without forcing the objects to remain alive, but the objects can still be retrieved by ID if they do. diff --git a/Doc/library/xml.dom.rst b/Doc/library/xml.dom.rst index 4d98015b8e..ee1d28c2c8 100644 --- a/Doc/library/xml.dom.rst +++ b/Doc/library/xml.dom.rst @@ -419,7 +419,7 @@ NodeList Objects ^^^^^^^^^^^^^^^^ A :class:`NodeList` represents a sequence of nodes. These objects are used in -two ways in the DOM Core recommendation: the :class:`Element` objects provides +two ways in the DOM Core recommendation: an :class:`Element` object provides one as its list of child nodes, and the :meth:`getElementsByTagName` and :meth:`getElementsByTagNameNS` methods of :class:`Node` return objects with this interface to represent query results. diff --git a/Lib/inspect.py b/Lib/inspect.py index b08e145f07..6d645bd046 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -155,9 +155,8 @@ def isfunction(object): def isgeneratorfunction(object): """Return true if the object is a user-defined generator function. - Generator function objects provides same attributes as functions. - - See help(isfunction) for attributes listing.""" + Generator function objects provide the same attributes as functions. + See help(isfunction) for a list of attributes.""" return bool((isfunction(object) or ismethod(object)) and object.func_code.co_flags & CO_GENERATOR) diff --git a/Lib/json/tests/test_decode.py b/Lib/json/tests/test_decode.py index 78d7fbb7c6..0014546b82 100644 --- a/Lib/json/tests/test_decode.py +++ b/Lib/json/tests/test_decode.py @@ -43,7 +43,7 @@ class TestDecode(object): self.assertEqual(self.loads(s, object_pairs_hook=OrderedDict, object_hook=lambda x: None), OrderedDict(p)) - # check that empty objects literals work (see #17368) + # check that empty object literals work (see #17368) self.assertEqual(self.loads('{}', object_pairs_hook=OrderedDict), OrderedDict()) self.assertEqual(self.loads('{"empty": {}}', diff --git a/Misc/HISTORY b/Misc/HISTORY index fceda8a445..5cb263c55c 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -15145,7 +15145,7 @@ machinery is moved to the new file importdl.c. module implementing deepcopy and normal (shallow) copy operations. See the library reference manual. -- Documentation strings for many objects types are accessible through +- Documentation strings for many object types are accessible through the __doc__ attribute. Modules, classes and functions support special syntax to initialize the __doc__ attribute: if the first statement consists of just a string literal, that string literal becomes the diff --git a/Misc/NEWS b/Misc/NEWS index 1fc6135d0e..64200d2e53 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1865,7 +1865,7 @@ Core and Builtins - Issue #21350: Fix file.writelines() to accept arbitrary buffer objects, as advertised. Patch by Brian Kearns. -- Issue #20437: Fixed 43 potential bugs when deleting objects references. +- Issue #20437: Fixed 43 potential bugs when deleting object references. - Issue #21134: Fix segfault when str is called on an uninitialized UnicodeEncodeError, UnicodeDecodeError, or UnicodeTranslateError object.