diff -r ebb1a16de89b Doc/c-api/set.rst --- a/Doc/c-api/set.rst Sat Apr 16 11:51:31 2016 +0000 +++ b/Doc/c-api/set.rst Sat Apr 16 15:51:13 2016 +0300 @@ -128,7 +128,7 @@ or :class:`frozenset` or instances of th of brand new frozensets before they are exposed to other code). Return 0 on success or -1 on failure. Raise a :exc:`TypeError` if the *key* is unhashable. Raise a :exc:`MemoryError` if there is no room to grow. Raise a - :exc:`SystemError` if *set* is an not an instance of :class:`set` or its + :exc:`SystemError` if *set* is not an instance of :class:`set` or its subtype. @@ -142,7 +142,7 @@ subtypes but not for instances of :class error is encountered. Does not raise :exc:`KeyError` for missing keys. Raise a :exc:`TypeError` if the *key* is unhashable. Unlike the Python :meth:`~set.discard` method, this function does not automatically convert unhashable sets into - temporary frozensets. Raise :exc:`PyExc_SystemError` if *set* is an not an + temporary frozensets. Raise :exc:`PyExc_SystemError` if *set* is not an instance of :class:`set` or its subtype. @@ -150,7 +150,7 @@ subtypes but not for instances of :class Return a new reference to an arbitrary object in the *set*, and removes the object from the *set*. Return *NULL* on failure. Raise :exc:`KeyError` if the - set is empty. Raise a :exc:`SystemError` if *set* is an not an instance of + set is empty. Raise a :exc:`SystemError` if *set* is not an instance of :class:`set` or its subtype. diff -r ebb1a16de89b Doc/c-api/unicode.rst --- a/Doc/c-api/unicode.rst Sat Apr 16 11:51:31 2016 +0000 +++ b/Doc/c-api/unicode.rst Sat Apr 16 15:51:13 2016 +0300 @@ -367,7 +367,7 @@ These APIs can be used to work with surr .. c:macro:: Py_UNICODE_IS_HIGH_SURROGATE(ch) - Check if *ch* is an high surrogate (``0xD800 <= ch <= 0xDBFF``). + Check if *ch* is a high surrogate (``0xD800 <= ch <= 0xDBFF``). .. c:macro:: Py_UNICODE_IS_LOW_SURROGATE(ch) diff -r ebb1a16de89b Doc/distutils/apiref.rst --- a/Doc/distutils/apiref.rst Sat Apr 16 11:51:31 2016 +0000 +++ b/Doc/distutils/apiref.rst Sat Apr 16 15:51:13 2016 +0300 @@ -837,7 +837,7 @@ selection by :class:`MSVCCompiler`. .. module:: distutils.bcppcompiler -This module provides :class:`BorlandCCompiler`, an subclass of the abstract +This module provides :class:`BorlandCCompiler`, a subclass of the abstract :class:`CCompiler` class for the Borland C++ compiler. diff -r ebb1a16de89b Doc/library/asyncio-eventloop.rst --- a/Doc/library/asyncio-eventloop.rst Sat Apr 16 11:51:31 2016 +0000 +++ b/Doc/library/asyncio-eventloop.rst Sat Apr 16 15:51:13 2016 +0300 @@ -513,7 +513,7 @@ Low-level socket operations The *address* must be already resolved to avoid the trap of hanging the entire event loop when the address requires doing a DNS lookup. For - example, it must be an IP address, not an hostname, for + example, it must be an IP address, not a hostname, for :py:data:`~socket.AF_INET` and :py:data:`~socket.AF_INET6` address families. Use :meth:`getaddrinfo` to resolve the hostname asynchronously. diff -r ebb1a16de89b Doc/library/ctypes.rst --- a/Doc/library/ctypes.rst Sat Apr 16 11:51:31 2016 +0000 +++ b/Doc/library/ctypes.rst Sat Apr 16 15:51:13 2016 +0300 @@ -671,7 +671,7 @@ positive integer:: TenPointsArrayType = POINT * 10 -Here is an example of an somewhat artificial data type, a structure containing 4 +Here is an example of a somewhat artificial data type, a structure containing 4 POINTs among other stuff:: >>> from ctypes import * @@ -1888,7 +1888,7 @@ Utility functions .. function:: POINTER(type) This factory function creates and returns a new ctypes pointer type. Pointer - types are cached an reused internally, so calling this function repeatedly is + types are cached and reused internally, so calling this function repeatedly is cheap. *type* must be a ctypes type. diff -r ebb1a16de89b Doc/library/idle.rst --- a/Doc/library/idle.rst Sat Apr 16 11:51:31 2016 +0000 +++ b/Doc/library/idle.rst Sat Apr 16 15:51:13 2016 +0300 @@ -128,7 +128,7 @@ Find Selection Search for the currently selected string, if there is one. Find in Files... - Open a file search dialog. Put results in an new output window. + Open a file search dialog. Put results in a new output window. Replace... Open a search-and-replace dialog. diff -r ebb1a16de89b Doc/library/tarfile.rst --- a/Doc/library/tarfile.rst Sat Apr 16 11:51:31 2016 +0000 +++ b/Doc/library/tarfile.rst Sat Apr 16 15:51:13 2016 +0300 @@ -129,7 +129,7 @@ Some facts and figures: | ``'r|bz2'`` | Open a bzip2 compressed *stream* for | | | reading. | +-------------+--------------------------------------------+ - | ``'r|xz'`` | Open a lzma compressed *stream* for | + | ``'r|xz'`` | Open an lzma compressed *stream* for | | | reading. | +-------------+--------------------------------------------+ | ``'w|'`` | Open an uncompressed *stream* for writing. | diff -r ebb1a16de89b Doc/tutorial/datastructures.rst --- a/Doc/tutorial/datastructures.rst Sat Apr 16 11:51:31 2016 +0000 +++ b/Doc/tutorial/datastructures.rst Sat Apr 16 15:51:13 2016 +0300 @@ -397,7 +397,7 @@ objects, such as lists. Though tuples may seem similar to lists, they are often used in different situations and for different purposes. -Tuples are :term:`immutable`, and usually contain an heterogeneous sequence of +Tuples are :term:`immutable`, and usually contain a heterogeneous sequence of elements that are accessed via unpacking (see later in this section) or indexing (or even by attribute in the case of :func:`namedtuples `). Lists are :term:`mutable`, and their elements are usually homogeneous and are diff -r ebb1a16de89b Doc/whatsnew/2.2.rst --- a/Doc/whatsnew/2.2.rst Sat Apr 16 11:51:31 2016 +0000 +++ b/Doc/whatsnew/2.2.rst Sat Apr 16 15:51:13 2016 +0300 @@ -720,7 +720,7 @@ possible types of the operands. (The controversy is over whether this is *really* a design flaw, and whether it's worth breaking existing code to fix this. It's caused endless discussions -on python-dev, and in July 2001 erupted into an storm of acidly sarcastic +on python-dev, and in July 2001 erupted into a storm of acidly sarcastic postings on :newsgroup:`comp.lang.python`. I won't argue for either side here and will stick to describing what's implemented in 2.2. Read :pep:`238` for a summary of arguments and counter-arguments.) diff -r ebb1a16de89b Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst Sat Apr 16 11:51:31 2016 +0000 +++ b/Doc/whatsnew/3.4.rst Sat Apr 16 15:51:13 2016 +0300 @@ -1457,7 +1457,7 @@ s), as well as a :meth:`~ssl.SSLContext. list of the loaded ``CA`` certificates. (Contributed by Christian Heimes in :issue:`18147`.) -If OpenSSL 0.9.8 or later is available, :class:`~ssl.SSLContext` has an new +If OpenSSL 0.9.8 or later is available, :class:`~ssl.SSLContext` has a new attribute :attr:`~ssl.SSLContext.verify_flags` that can be used to control the certificate verification process by setting it to some combination of the new constants :data:`~ssl.VERIFY_DEFAULT`, :data:`~ssl.VERIFY_CRL_CHECK_LEAF`, diff -r ebb1a16de89b Doc/whatsnew/3.6.rst --- a/Doc/whatsnew/3.6.rst Sat Apr 16 11:51:31 2016 +0000 +++ b/Doc/whatsnew/3.6.rst Sat Apr 16 15:51:13 2016 +0300 @@ -214,7 +214,7 @@ directives ``%G``, ``%u`` and ``%V``. faulthandler ------------ -On Windows, the :mod:`faulthandler` module now installs an handler for Windows +On Windows, the :mod:`faulthandler` module now installs a handler for Windows exceptions: see :func:`faulthandler.enable`. (Contributed by Victor Stinner in :issue:`23848`.) diff -r ebb1a16de89b Include/listobject.h --- a/Include/listobject.h Sat Apr 16 11:51:31 2016 +0000 +++ b/Include/listobject.h Sat Apr 16 15:51:13 2016 +0300 @@ -2,7 +2,7 @@ /* List object interface */ /* -Another generally useful object type is an list of object pointers. +Another generally useful object type is a list of object pointers. This is a mutable type: the list items can be changed, and items can be added or removed. Out-of-range indices or non-list objects are ignored. diff -r ebb1a16de89b Include/unicodeobject.h --- a/Include/unicodeobject.h Sat Apr 16 11:51:31 2016 +0000 +++ b/Include/unicodeobject.h Sat Apr 16 15:51:13 2016 +0300 @@ -844,7 +844,7 @@ PyAPI_FUNC(int) PyUnicode_Resize( Py_ssize_t length /* New length */ ); -/* Decode obj to an Unicode object. +/* Decode obj to a Unicode object. bytes, bytearray and other bytes-like objects are decoded according to the given encoding and error handler. The encoding and error handler can be diff -r ebb1a16de89b Lib/_pydecimal.py --- a/Lib/_pydecimal.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/_pydecimal.py Sat Apr 16 15:51:13 2016 +0300 @@ -252,7 +252,7 @@ class InvalidOperation(DecimalException) class ConversionSyntax(InvalidOperation): """Trying to convert badly formed string. - This occurs and signals invalid-operation if an string is being + This occurs and signals invalid-operation if a string is being converted to a number and it does not conform to the numeric string syntax. The result is [0,qNaN]. """ diff -r ebb1a16de89b Lib/asyncio/selector_events.py --- a/Lib/asyncio/selector_events.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/asyncio/selector_events.py Sat Apr 16 15:51:13 2016 +0300 @@ -387,7 +387,7 @@ class BaseSelectorEventLoop(base_events. The address must be already resolved to avoid the trap of hanging the entire event loop when the address requires doing a DNS lookup. For - example, it must be an IP address, not an hostname, for AF_INET and + example, it must be an IP address, not a hostname, for AF_INET and AF_INET6 address families. Use getaddrinfo() to resolve the hostname asynchronously. diff -r ebb1a16de89b Lib/idlelib/AutoComplete.py --- a/Lib/idlelib/AutoComplete.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/idlelib/AutoComplete.py Sat Apr 16 15:51:13 2016 +0300 @@ -64,7 +64,7 @@ class AutoComplete: def try_open_completions_event(self, event): """Happens when it would be nice to open a completion list, but not - really necessary, for example after an dot, so function + really necessary, for example after a dot, so function calls won't be made. """ lastchar = self.text.get("insert-1c") diff -r ebb1a16de89b Lib/idlelib/Debugger.py --- a/Lib/idlelib/Debugger.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/idlelib/Debugger.py Sat Apr 16 15:51:13 2016 +0300 @@ -372,7 +372,7 @@ class StackViewer(ScrolledList): def __init__(self, master, flist, gui): if macosxSupport.isAquaTk(): # At least on with the stock AquaTk version on OSX 10.4 you'll - # get an shaking GUI that eventually kills IDLE if the width + # get a shaking GUI that eventually kills IDLE if the width # argument is specified. ScrolledList.__init__(self, master) else: diff -r ebb1a16de89b Lib/idlelib/WidgetRedirector.py --- a/Lib/idlelib/WidgetRedirector.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/idlelib/WidgetRedirector.py Sat Apr 16 15:51:13 2016 +0300 @@ -68,7 +68,7 @@ class WidgetRedirector: '''Return OriginalCommand(operation) after registering function. Registration adds an operation: function pair to ._operations. - It also adds an widget function attribute that masks the tkinter + It also adds a widget function attribute that masks the tkinter class instance method. Method masking operates independently from command dispatch. diff -r ebb1a16de89b Lib/idlelib/configDialog.py --- a/Lib/idlelib/configDialog.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/idlelib/configDialog.py Sat Apr 16 15:51:13 2016 +0300 @@ -1196,7 +1196,7 @@ class ConfigDialog(Toplevel): All values are treated as text, and it is up to the user to supply reasonable values. The only exception to this are the 'enable*' options, - which are boolean, and can be toggled with an True/False button. + which are boolean, and can be toggled with a True/False button. """ parent = self.parent frame = self.tabPages.pages['Extensions'].frame diff -r ebb1a16de89b Lib/lib2to3/fixer_base.py --- a/Lib/lib2to3/fixer_base.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/lib2to3/fixer_base.py Sat Apr 16 15:51:13 2016 +0300 @@ -49,7 +49,7 @@ class BaseFix(object): """Initializer. Subclass may override. Args: - options: an dict containing the options passed to RefactoringTool + options: a dict containing the options passed to RefactoringTool that could be used to customize the fixer through the command line. log: a list to append warnings and other messages to. """ diff -r ebb1a16de89b Lib/lib2to3/refactor.py --- a/Lib/lib2to3/refactor.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/lib2to3/refactor.py Sat Apr 16 15:51:13 2016 +0300 @@ -184,7 +184,7 @@ class RefactoringTool(object): Args: fixer_names: a list of fixers to import - options: an dict with configuration. + options: a dict with configuration. explicit: a list of fixers to run even if they are explicit. """ self.fixers = fixer_names diff -r ebb1a16de89b Lib/multiprocessing/managers.py --- a/Lib/multiprocessing/managers.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/multiprocessing/managers.py Sat Apr 16 15:51:13 2016 +0300 @@ -842,7 +842,7 @@ def RebuildProxy(func, token, serializer def MakeProxyType(name, exposed, _cache={}): ''' - Return an proxy type whose methods are given by `exposed` + Return a proxy type whose methods are given by `exposed` ''' exposed = tuple(exposed) try: diff -r ebb1a16de89b Lib/optparse.py --- a/Lib/optparse.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/optparse.py Sat Apr 16 15:51:13 2016 +0300 @@ -1362,7 +1362,7 @@ class OptionParser (OptionContainer): sys.argv[1:]). Any errors result in a call to 'error()', which by default prints the usage message to stderr and calls sys.exit() with an error message. On success returns a pair - (values, args) where 'values' is an Values instance (with all + (values, args) where 'values' is a Values instance (with all your option values) and 'args' is the list of arguments left over after parsing options. """ diff -r ebb1a16de89b Lib/socketserver.py --- a/Lib/socketserver.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/socketserver.py Sat Apr 16 15:51:13 2016 +0300 @@ -747,7 +747,7 @@ class StreamRequestHandler(BaseRequestHa try: self.wfile.flush() except socket.error: - # An final socket error may have occurred here, such as + # A final socket error may have occurred here, such as # the local error ECONNABORTED. pass self.wfile.close() diff -r ebb1a16de89b Lib/sqlite3/test/regression.py --- a/Lib/sqlite3/test/regression.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/sqlite3/test/regression.py Sat Apr 16 15:51:13 2016 +0300 @@ -73,7 +73,7 @@ class RegressionTests(unittest.TestCase) def CheckStatementFinalizationOnCloseDb(self): # pysqlite versions <= 2.3.3 only finalized statements in the statement # cache when closing the database. statements that were still - # referenced in cursors weren't closed an could provoke " + # referenced in cursors weren't closed and could provoke " # "OperationalError: Unable to close due to unfinalised statements". con = sqlite.connect(":memory:") cursors = [] diff -r ebb1a16de89b Lib/tarfile.py --- a/Lib/tarfile.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/tarfile.py Sat Apr 16 15:51:13 2016 +0300 @@ -1528,9 +1528,9 @@ class TarFile(object): 'x' or 'x:' create a tarfile exclusively without compression, raise an exception if the file is already created - 'x:gz' create an gzip compressed tarfile, raise an exception + 'x:gz' create a gzip compressed tarfile, raise an exception if the file is already created - 'x:bz2' create an bzip2 compressed tarfile, raise an exception + 'x:bz2' create a bzip2 compressed tarfile, raise an exception if the file is already created 'x:xz' create an lzma compressed tarfile, raise an exception if the file is already created diff -r ebb1a16de89b Lib/test/test_asyncio/test_selector_events.py --- a/Lib/test/test_asyncio/test_selector_events.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/test/test_asyncio/test_selector_events.py Sat Apr 16 15:51:13 2016 +0300 @@ -1182,7 +1182,7 @@ class SelectorSslTransportTests(test_uti self.assertIs(exc, waiter.exception()) def test_cancel_handshake(self): - # Python issue #23197: cancelling an handshake must not raise an + # Python issue #23197: cancelling a handshake must not raise an # exception or log an error, even if the handshake failed waiter = asyncio.Future(loop=self.loop) transport = self.ssl_transport(waiter=waiter) diff -r ebb1a16de89b Lib/test/test_asyncio/test_sslproto.py --- a/Lib/test/test_asyncio/test_sslproto.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/test/test_asyncio/test_sslproto.py Sat Apr 16 15:51:13 2016 +0300 @@ -40,7 +40,7 @@ class SslProtoHandshakeTests(test_utils. ssl_proto.connection_made(transport) def test_cancel_handshake(self): - # Python issue #23197: cancelling an handshake must not raise an + # Python issue #23197: cancelling a handshake must not raise an # exception or log an error, even if the handshake failed waiter = asyncio.Future(loop=self.loop) ssl_proto = self.ssl_protocol(waiter) diff -r ebb1a16de89b Lib/test/test_binop.py --- a/Lib/test/test_binop.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/test/test_binop.py Sat Apr 16 15:51:13 2016 +0300 @@ -58,7 +58,7 @@ class Rat(object): den = property(_get_den, None) def __repr__(self): - """Convert a Rat to an string resembling a Rat constructor call.""" + """Convert a Rat to a string resembling a Rat constructor call.""" return "Rat(%d, %d)" % (self.__num, self.__den) def __str__(self): diff -r ebb1a16de89b Lib/test/test_faulthandler.py --- a/Lib/test/test_faulthandler.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/test/test_faulthandler.py Sat Apr 16 15:51:13 2016 +0300 @@ -715,7 +715,7 @@ class FaultHandlerTests(unittest.TestCas sys.stderr = stderr def test_stderr_None(self): - # Issue #21497: provide an helpful error if sys.stderr is None, + # Issue #21497: provide a helpful error if sys.stderr is None, # instead of just an attribute error: "None has no attribute fileno". with self.check_stderr_none(): faulthandler.enable() diff -r ebb1a16de89b Lib/test/test_pathlib.py --- a/Lib/test/test_pathlib.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/test/test_pathlib.py Sat Apr 16 15:51:13 2016 +0300 @@ -200,7 +200,7 @@ class _BasePurePathTest(object): def _check_str_subclass(self, *args): # Issue #21127: it should be possible to construct a PurePath object - # from an str subclass instance, and it then gets converted to + # from a str subclass instance, and it then gets converted to # a pure str object. class StrSubclass(str): pass diff -r ebb1a16de89b Lib/test/test_sys.py --- a/Lib/test/test_sys.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/test/test_sys.py Sat Apr 16 15:51:13 2016 +0300 @@ -644,7 +644,7 @@ class SysModuleTest(unittest.TestCase): self.assertEqual(os.path.abspath(sys.executable), sys.executable) # Issue #7774: Ensure that sys.executable is an empty string if argv[0] - # has been set to an non existent program name and Python is unable to + # has been set to a non existent program name and Python is unable to # retrieve the real program name # For a normal installation, it should work without 'cwd' diff -r ebb1a16de89b Lib/test/test_threading.py --- a/Lib/test/test_threading.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/test/test_threading.py Sat Apr 16 15:51:13 2016 +0300 @@ -1083,7 +1083,7 @@ class EventTests(lock_tests.EventTests): eventtype = staticmethod(threading.Event) class ConditionAsRLockTests(lock_tests.RLockTests): - # An Condition uses an RLock by default and exports its API. + # A Condition uses an RLock by default and exports its API. locktype = staticmethod(threading.Condition) class ConditionTests(lock_tests.ConditionTests): diff -r ebb1a16de89b Lib/test/test_zipapp.py --- a/Lib/test/test_zipapp.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/test/test_zipapp.py Sat Apr 16 15:51:13 2016 +0300 @@ -195,7 +195,7 @@ class ZipAppTest(unittest.TestCase): self.assertTrue(new_target.getvalue().startswith(b'#!python2.7\n')) def test_read_from_pathobj(self): - # Test that we can copy an archive using an pathlib.Path object + # Test that we can copy an archive using a pathlib.Path object # for the source. source = self.tmpdir / 'source' source.mkdir() diff -r ebb1a16de89b Lib/tkinter/__init__.py --- a/Lib/tkinter/__init__.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/tkinter/__init__.py Sat Apr 16 15:51:13 2016 +0300 @@ -2771,7 +2771,7 @@ class Menu(Widget): self.deletecommand(c) self.tk.call(self._w, 'delete', index1, index2) def entrycget(self, index, option): - """Return the resource value of an menu item for OPTION at INDEX.""" + """Return the resource value of a menu item for OPTION at INDEX.""" return self.tk.call(self._w, 'entrycget', index, '-' + option) def entryconfigure(self, index, cnf=None, **kw): """Configure a menu item at INDEX.""" diff -r ebb1a16de89b Lib/tkinter/dnd.py --- a/Lib/tkinter/dnd.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/tkinter/dnd.py Sat Apr 16 15:51:13 2016 +0300 @@ -3,7 +3,7 @@ This is very preliminary. I currently only support dnd *within* one application, between different windows (or within the same window). -I an trying to make this as generic as possible -- not dependent on +I am trying to make this as generic as possible -- not dependent on the use of a particular widget or icon type, etc. I also hope that this will work with Pmw. diff -r ebb1a16de89b Lib/tkinter/tix.py --- a/Lib/tkinter/tix.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/tkinter/tix.py Sat Apr 16 15:51:13 2016 +0300 @@ -702,7 +702,7 @@ class DirSelectBox(TixWidget): class ExFileSelectBox(TixWidget): """ExFileSelectBox - MS Windows style file select box. - It provides an convenient method for the user to select files. + It provides a convenient method for the user to select files. Subwidget Class --------- ----- @@ -760,7 +760,7 @@ class DirSelectDialog(TixWidget): # Should inherit from a Dialog class class ExFileSelectDialog(TixWidget): """ExFileSelectDialog - MS Windows style file select dialog. - It provides an convenient method for the user to select files. + It provides a convenient method for the user to select files. Subwidgets Class ---------- ----- diff -r ebb1a16de89b Lib/tkinter/ttk.py --- a/Lib/tkinter/ttk.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/tkinter/ttk.py Sat Apr 16 15:51:13 2016 +0300 @@ -1478,7 +1478,7 @@ class LabeledScale(Frame): can be accessed through instance.label""" def __init__(self, master=None, variable=None, from_=0, to=10, **kw): - """Construct an horizontal LabeledScale with parent master, a + """Construct a horizontal LabeledScale with parent master, a variable to be associated with the Ttk Scale widget and its range. If variable is not specified, a tkinter.IntVar is created. diff -r ebb1a16de89b Lib/xmlrpc/client.py --- a/Lib/xmlrpc/client.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/xmlrpc/client.py Sat Apr 16 15:51:13 2016 +0300 @@ -1446,7 +1446,7 @@ class ServerProxy: # magic method dispatcher return _Method(self.__request, name) - # note: to call a remote object with an non-standard name, use + # note: to call a remote object with a non-standard name, use # result getattr(server, "strange-python-name")(args) def __call__(self, attr): diff -r ebb1a16de89b Lib/zipapp.py --- a/Lib/zipapp.py Sat Apr 16 11:51:31 2016 +0000 +++ b/Lib/zipapp.py Sat Apr 16 15:51:13 2016 +0300 @@ -89,9 +89,10 @@ def create_archive(source, target=None, The created application archive will have a shebang line specifying that it should run with INTERPRETER (there will be no shebang line if INTERPRETER is None), and a __main__.py which runs MAIN (if MAIN is - not specified, an existing __main__.py will be used). It is an to specify - MAIN for anything other than a directory source with no __main__.py, and it - is an error to omit MAIN if the directory has no __main__.py. + not specified, an existing __main__.py will be used). It is an error + to specify MAIN for anything other than a directory source with no + __main__.py, and it is an error to omit MAIN if the directory has no + __main__.py. """ # Are we copying an existing archive? source_is_file = False diff -r ebb1a16de89b Misc/HISTORY --- a/Misc/HISTORY Sat Apr 16 11:51:31 2016 +0000 +++ b/Misc/HISTORY Sat Apr 16 15:51:13 2016 +0300 @@ -7220,7 +7220,7 @@ Library cElementTree module is updated too. - Issue #7774: Set sys.executable to an empty string if argv[0] has been set to - an non existent program name and Python is unable to retrieve the real program + a non existent program name and Python is unable to retrieve the real program name. - Issue #7880: Fix sysconfig when the python executable is a symbolic link. @@ -14013,7 +14013,7 @@ Core and builtins would not be removed while allocating a new weakref object. Since GC could be invoked at that time, however, that assumption was invalid. In a truly obscure case of GC being triggered during - creation for a new weakref object for an referent which already + creation for a new weakref object for a referent which already has a weakref without a callback which is only referenced from cyclic trash, a memory error can occur. This consistently created a segfault in a debug build, but provided less predictable behavior in @@ -20227,7 +20227,7 @@ list of all new modules is included belo Probably the most pervasive change is the addition of Unicode support. We've added a new fundamental datatype, the Unicode string, a new -build-in function unicode(), an numerous C APIs to deal with Unicode +build-in function unicode(), a numerous C APIs to deal with Unicode and encodings. See the file Misc/unicode.txt for details, or http://starship.python.net/crew/lemburg/unicode-proposal.txt. @@ -27179,7 +27179,7 @@ a string it is returned unchanged, other * repr(x) returns the same as `x`. (Some users found it easier to have this as a function.) -* round(x) returns the floating point number x rounded to an whole +* round(x) returns the floating point number x rounded to a whole number, represented as a floating point number. round(x, n) returns x rounded to n digits. diff -r ebb1a16de89b Misc/NEWS --- a/Misc/NEWS Sat Apr 16 11:51:31 2016 +0000 +++ b/Misc/NEWS Sat Apr 16 15:51:13 2016 +0300 @@ -4117,7 +4117,7 @@ Library - Issue #21000: Improve the command-line interface of json.tool. - Issue #20995: Enhance default ciphers used by the ssl module to enable - better security an prioritize perfect forward secrecy. + better security a prioritize perfect forward secrecy. - Issue #20884: Don't assume that __file__ is defined on importlib.__init__. diff -r ebb1a16de89b Modules/_csv.c --- a/Modules/_csv.c Sat Apr 16 11:51:31 2016 +0000 +++ b/Modules/_csv.c Sat Apr 16 15:51:13 2016 +0300 @@ -731,7 +731,7 @@ parse_process_char(ReaderObj *self, Py_U break; case QUOTE_IN_QUOTED_FIELD: - /* doublequote - seen a quote in an quoted field */ + /* doublequote - seen a quote in a quoted field */ if (dialect->quoting != QUOTE_NONE && c == dialect->quotechar) { /* save "" as " */ diff -r ebb1a16de89b Modules/_ctypes/_ctypes.c --- a/Modules/_ctypes/_ctypes.c Sat Apr 16 11:51:31 2016 +0000 +++ b/Modules/_ctypes/_ctypes.c Sat Apr 16 15:51:13 2016 +0300 @@ -3802,7 +3802,7 @@ PyCFuncPtr_call(PyCFuncPtrObject *self, return NULL; } /* there should be more checks? No, in Python */ - /* First arg is an pointer to an interface instance */ + /* First arg is a pointer to an interface instance */ if (!this->b_ptr || *(void **)this->b_ptr == NULL) { PyErr_SetString(PyExc_ValueError, "NULL COM pointer access"); diff -r ebb1a16de89b Modules/_io/stringio.c --- a/Modules/_io/stringio.c Sat Apr 16 11:51:31 2016 +0000 +++ b/Modules/_io/stringio.c Sat Apr 16 15:51:13 2016 +0300 @@ -438,7 +438,7 @@ stringio_iternext(stringio *self) _PyIO_str_readline, NULL); if (line && !PyUnicode_Check(line)) { PyErr_Format(PyExc_IOError, - "readline() should have returned an str object, " + "readline() should have returned a str object, " "not '%.200s'", Py_TYPE(line)->tp_name); Py_DECREF(line); return NULL; diff -r ebb1a16de89b Modules/_io/textio.c --- a/Modules/_io/textio.c Sat Apr 16 11:51:31 2016 +0000 +++ b/Modules/_io/textio.c Sat Apr 16 15:51:13 2016 +0300 @@ -2689,7 +2689,7 @@ textiowrapper_iternext(textio *self) _PyIO_str_readline, NULL); if (line && !PyUnicode_Check(line)) { PyErr_Format(PyExc_IOError, - "readline() should have returned an str object, " + "readline() should have returned a str object, " "not '%.200s'", Py_TYPE(line)->tp_name); Py_DECREF(line); return NULL; diff -r ebb1a16de89b Modules/_pickle.c --- a/Modules/_pickle.c Sat Apr 16 11:51:31 2016 +0000 +++ b/Modules/_pickle.c Sat Apr 16 15:51:13 2016 +0300 @@ -4703,7 +4703,7 @@ calc_binsize(char *bytes, int nbytes) /* s contains x bytes of a little-endian integer. Return its value as a * C int. Obscure: when x is 1 or 2, this is an unsigned little-endian - * int, but when x is 4 it's a signed one. This is an historical source + * int, but when x is 4 it's a signed one. This is a historical source * of x-platform bugs. */ static long diff -r ebb1a16de89b Modules/faulthandler.c --- a/Modules/faulthandler.c Sat Apr 16 11:51:31 2016 +0000 +++ b/Modules/faulthandler.c Sat Apr 16 15:51:13 2016 +0300 @@ -1178,7 +1178,7 @@ static PyMethodDef module_methods[] = { {"register", (PyCFunction)faulthandler_register_py, METH_VARARGS|METH_KEYWORDS, PyDoc_STR("register(signum, file=sys.stderr, all_threads=True, chain=False): " - "register an handler for the signal 'signum': dump the " + "register a handler for the signal 'signum': dump the " "traceback of the current thread, or of all threads if " "all_threads is True, into file")}, {"unregister", diff -r ebb1a16de89b Modules/selectmodule.c --- a/Modules/selectmodule.c Sat Apr 16 11:51:31 2016 +0000 +++ b/Modules/selectmodule.c Sat Apr 16 15:51:13 2016 +0300 @@ -2127,7 +2127,7 @@ kqueue_queue_control(kqueue_queue_Object if (_PyTime_FromSecondsObject(&timeout, otimeout, _PyTime_ROUND_CEILING) < 0) { PyErr_Format(PyExc_TypeError, - "timeout argument must be an number " + "timeout argument must be a number " "or None, got %.200s", Py_TYPE(otimeout)->tp_name); return NULL; diff -r ebb1a16de89b Objects/bytearrayobject.c --- a/Objects/bytearrayobject.c Sat Apr 16 11:51:31 2016 +0000 +++ b/Objects/bytearrayobject.c Sat Apr 16 15:51:13 2016 +0300 @@ -3018,7 +3018,7 @@ bytearray(bytes_or_buffer) -> mutable co bytearray(int) -> bytes array of size given by the parameter initialized with null bytes\n\ bytearray() -> empty bytes array\n\ \n\ -Construct an mutable bytearray object from:\n\ +Construct a mutable bytearray object from:\n\ - an iterable yielding integers in range(256)\n\ - a text string encoded using the specified encoding\n\ - a bytes or a buffer object\n\ diff -r ebb1a16de89b PC/clinic/winreg.c.h --- a/PC/clinic/winreg.c.h Sat Apr 16 11:51:31 2016 +0000 +++ b/PC/clinic/winreg.c.h Sat Apr 16 15:51:13 2016 +0300 @@ -913,7 +913,7 @@ PyDoc_STRVAR(winreg_SetValueEx__doc__, " references to environment variables (for example,\n" " %PATH%).\n" " REG_LINK -- A Unicode symbolic link.\n" -" REG_MULTI_SZ -- An sequence of null-terminated strings, terminated\n" +" REG_MULTI_SZ -- A sequence of null-terminated strings, terminated\n" " by two null characters. Note that Python handles\n" " this termination automatically.\n" " REG_NONE -- No defined value type.\n" @@ -1056,4 +1056,4 @@ winreg_QueryReflectionKey(PyModuleDef *m exit: return return_value; } -/*[clinic end generated code: output=71f5bc30b646807b input=a9049054013a1b77]*/ +/*[clinic end generated code: output=19e4918dfaba0636 input=a9049054013a1b77]*/ diff -r ebb1a16de89b PC/winreg.c --- a/PC/winreg.c Sat Apr 16 11:51:31 2016 +0000 +++ b/PC/winreg.c Sat Apr 16 15:51:13 2016 +0300 @@ -792,7 +792,7 @@ winreg.ConnectRegistry -> HKEY The predefined key to connect to. / -Establishes a connection to the registry on on another computer. +Establishes a connection to the registry on another computer. The return value is the handle of the opened key. If the function fails, an OSError exception is raised. @@ -1605,7 +1605,7 @@ winreg.SetValueEx references to environment variables (for example, %PATH%). REG_LINK -- A Unicode symbolic link. - REG_MULTI_SZ -- An sequence of null-terminated strings, terminated + REG_MULTI_SZ -- A sequence of null-terminated strings, terminated by two null characters. Note that Python handles this termination automatically. REG_NONE -- No defined value type. @@ -1631,7 +1631,7 @@ the configuration registry to help the r static PyObject * winreg_SetValueEx_impl(PyModuleDef *module, HKEY key, Py_UNICODE *value_name, PyObject *reserved, DWORD type, PyObject *value) -/*[clinic end generated code: output=ea092a935c361582 input=e73dec535ebeea7d]*/ +/*[clinic end generated code: output=ea092a935c361582 input=f1b16cbcc3ed4101]*/ { BYTE *data; DWORD len; diff -r ebb1a16de89b Python/thread_nt.h --- a/Python/thread_nt.h Sat Apr 16 11:51:31 2016 +0000 +++ b/Python/thread_nt.h Sat Apr 16 15:51:13 2016 +0300 @@ -231,7 +231,7 @@ PyThread_start_new_thread(void (*func)(v } /* - * Return the thread Id instead of an handle. The Id is said to uniquely identify the + * Return the thread Id instead of a handle. The Id is said to uniquely identify the * thread in the system */ long