From 204bf0b9aecd221c33f3e0909f261411783acf1b Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Mon, 11 Jul 2016 07:51:37 +0000 Subject: English spelling and grammar fixes --- Doc/library/pyexpat.rst | 2 +- Doc/library/urllib.request.rst | 2 +- Doc/library/xml.dom.minidom.rst | 2 +- Doc/library/xmlrpc.server.rst | 2 +- Lib/distutils/tests/test_build_ext.py | 2 +- Lib/idlelib/NEWS.txt | 2 +- Lib/test/test_ipaddress.py | 4 ++-- Lib/unittest/mock.py | 2 +- Lib/xml/dom/expatbuilder.py | 2 +- Lib/xmlrpc/server.py | 2 +- Misc/NEWS | 12 ++++++------ 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst index 29c9f34..d6445f8 100644 --- a/Doc/library/pyexpat.rst +++ b/Doc/library/pyexpat.rst @@ -244,7 +244,7 @@ XMLParser Objects The following attributes contain values relating to the most recent error encountered by an :class:`xmlparser` object, and will only have correct values -once a call to :meth:`Parse` or :meth:`ParseFile` has raised a +once a call to :meth:`Parse` or :meth:`ParseFile` has raised an :exc:`xml.parsers.expat.ExpatError` exception. diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index 1338906..6c1bfb8 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -1138,7 +1138,7 @@ the returned bytes object to string once it determines or guesses the appropriate encoding. The following W3C document, https://www.w3.org/International/O-charset\ , lists -the various ways in which a (X)HTML or a XML document could have specified its +the various ways in which an (X)HTML or an XML document could have specified its encoding information. As the python.org website uses *utf-8* encoding as specified in its meta tag, we diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst index e1042e7..2e9e814 100644 --- a/Doc/library/xml.dom.minidom.rst +++ b/Doc/library/xml.dom.minidom.rst @@ -94,7 +94,7 @@ document: the one that holds all others. Here is an example program:: When you are finished with a DOM tree, you may optionally call the :meth:`unlink` method to encourage early cleanup of the now-unneeded -objects. :meth:`unlink` is a :mod:`xml.dom.minidom`\ -specific +objects. :meth:`unlink` is an :mod:`xml.dom.minidom`\ -specific extension to the DOM API that renders the node and its descendants are essentially useless. Otherwise, Python's garbage collector will eventually take care of the objects in the tree. diff --git a/Doc/library/xmlrpc.server.rst b/Doc/library/xmlrpc.server.rst index ad1e812..1c77e84 100644 --- a/Doc/library/xmlrpc.server.rst +++ b/Doc/library/xmlrpc.server.rst @@ -293,7 +293,7 @@ requests sent to Python CGI scripts. .. method:: CGIXMLRPCRequestHandler.handle_request(request_text=None) - Handle a XML-RPC request. If *request_text* is given, it should be the POST + Handle an XML-RPC request. If *request_text* is given, it should be the POST data provided by the HTTP server, otherwise the contents of stdin will be used. Example:: diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index 8f62b1a..4e397ea 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -243,7 +243,7 @@ class BuildExtTestCase(TempdirManager, self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts) # second element of each tuple in 'ext_modules' - # must be a ary (build info) + # must be a dictionary (build info) exts = [('foo.bar', '')] self.assertRaises(DistutilsSetupError, cmd.check_extensions_list, exts) diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 6ef2aa5..f45dd2b 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -195,7 +195,7 @@ What's New in IDLE 3.5.0? Changes are written to HOME/.idlerc/config-extensions.cfg. Original patch by Tal Einat. -- Issue #16233: A module browser (File : Class Browser, Alt+C) requires a +- Issue #16233: A module browser (File : Class Browser, Alt+C) requires an editor window with a filename. When Class Browser is requested otherwise, from a shell, output window, or 'Untitled' editor, Idle no longer displays an error box. It now pops up an Open Module box (Alt+M). If a valid name diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py index be62fad..94bf4cd 100644 --- a/Lib/test/test_ipaddress.py +++ b/Lib/test/test_ipaddress.py @@ -734,7 +734,7 @@ class IpaddrUnitTest(unittest.TestCase): self.assertEqual("IPv6Interface('::1/128')", repr(ipaddress.IPv6Interface('::1'))) - # issue #16531: constructing IPv4Network from a (address, mask) tuple + # issue #16531: constructing IPv4Network from an (address, mask) tuple def testIPv4Tuple(self): # /32 ip = ipaddress.IPv4Address('192.0.2.1') @@ -797,7 +797,7 @@ class IpaddrUnitTest(unittest.TestCase): self.assertEqual(ipaddress.IPv4Interface((3221225985, 24)), ipaddress.IPv4Interface('192.0.2.1/24')) - # issue #16531: constructing IPv6Network from a (address, mask) tuple + # issue #16531: constructing IPv6Network from an (address, mask) tuple def testIPv6Tuple(self): # /128 ip = ipaddress.IPv6Address('2001:db8::') diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 1adfcf9..7f30b28 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -744,7 +744,7 @@ class NonCallableMock(Base): def _call_matcher(self, _call): """ - Given a call (or simply a (args, kwargs) tuple), return a + Given a call (or simply an (args, kwargs) tuple), return a comparison key suitable for matching with other calls. This is a best effort method which relies on the spec's signature, if available, or falls back on the arguments themselves. diff --git a/Lib/xml/dom/expatbuilder.py b/Lib/xml/dom/expatbuilder.py index 8976144..2bd835b 100644 --- a/Lib/xml/dom/expatbuilder.py +++ b/Lib/xml/dom/expatbuilder.py @@ -10,7 +10,7 @@ This avoids all the overhead of SAX and pulldom to gain performance. # minidom DOM and can't be used with other DOM implementations. This # is due, in part, to a lack of appropriate methods in the DOM (there is # no way to create Entity and Notation nodes via the DOM Level 2 -# interface), and for performance. The later is the cause of some fairly +# interface), and for performance. The latter is the cause of some fairly # cryptic code. # # Performance hacks: diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py index 5b5bf7c..7817693 100644 --- a/Lib/xmlrpc/server.py +++ b/Lib/xmlrpc/server.py @@ -184,7 +184,7 @@ class SimpleXMLRPCDispatcher: are considered private and will not be called by SimpleXMLRPCServer. - If a registered function matches a XML-RPC request, then it + If a registered function matches an XML-RPC request, then it will be called instead of the registered instance. If the optional allow_dotted_names argument is true and the diff --git a/Misc/NEWS b/Misc/NEWS index d9887ec..b7ad75b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,8 +13,8 @@ Core and Builtins - Issue #27473: Fixed possible integer overflow in bytes and bytearray concatenations. Patch by Xiang Zhang. -- Issue #27443: __length_hint__() of bytearray itearator no longer return - negative integer for resized bytearray. +- Issue #27443: __length_hint__() of bytearray iterators no longer return a + negative integer for a resized bytearray. Library ------- @@ -1965,7 +1965,7 @@ Library JoinableQueue was merged with Queue). - Issue #23908: os functions now reject paths with embedded null character - on Windows instead of silently truncate them. + on Windows instead of silently truncating them. - Issue #23728: binascii.crc_hqx() could return an integer outside of the range 0-0xffff for empty data. @@ -3221,7 +3221,7 @@ Library - Issue #22396: On 32-bit AIX platform, don't expose os.posix_fadvise() nor os.posix_fallocate() because their prototypes in system headers are wrong. -- Issue #22517: When a io.BufferedRWPair object is deallocated, clear its +- Issue #22517: When an io.BufferedRWPair object is deallocated, clear its weakrefs. - Issue #22437: Number of capturing groups in regular expression is no longer @@ -3301,7 +3301,7 @@ Library - Issue #22168: Prevent turtle AttributeError with non-default Canvas on OS X. - Issue #21147: sqlite3 now raises an exception if the request contains a null - character instead of truncate it. Based on patch by Victor Stinner. + character instead of truncating it. Based on patch by Victor Stinner. - Issue #13968: The glob module now supports recursive search in subdirectories using the "**" pattern. @@ -4153,7 +4153,7 @@ Build an explicit runtime library dependency. - Issue #17861: Tools/scripts/generate_opcode_h.py automatically regenerates - Include/opcode.h from Lib/opcode.py if the later gets any change. + Include/opcode.h from Lib/opcode.py if the latter gets any change. - Issue #20644: OS X installer build support for documentation build changes in 3.4.1: assume externally supplied sphinx-build is available in /usr/bin. -- cgit v0.12