diff -r 49abb3985db3 Doc/library/email.contentmanager.rst --- a/Doc/library/email.contentmanager.rst Mon Apr 13 16:32:16 2015 -0400 +++ b/Doc/library/email.contentmanager.rst Tue Apr 14 03:27:51 2015 +0200 @@ -425,7 +425,7 @@ *cid* as its value. If *params* is specified, iterate its ``items`` method and use the - resulting ``(key, value)`` pairs to set additional paramters on the + resulting ``(key, value)`` pairs to set additional parameters on the :mailheader:`Content-Type` header. If *headers* is specified and is a list of strings of the form diff -r 49abb3985db3 Doc/library/threading.rst --- a/Doc/library/threading.rst Mon Apr 13 16:32:16 2015 -0400 +++ b/Doc/library/threading.rst Tue Apr 14 03:27:51 2015 +0200 @@ -874,7 +874,7 @@ of threads that need to wait for each other. Each of the threads tries to pass the barrier by calling the :meth:`~Barrier.wait` method and will block until all of the threads have made the call. At this points, the threads are released -simultanously. +simultaneously. The barrier can be reused any number of times for the same number of threads. diff -r 49abb3985db3 Doc/library/wsgiref.rst --- a/Doc/library/wsgiref.rst Mon Apr 13 16:32:16 2015 -0400 +++ b/Doc/library/wsgiref.rst Tue Apr 14 03:27:51 2015 +0200 @@ -759,7 +759,7 @@ # object that accepts two arguments. For that purpose, we're going to # use a function (note that you're not limited to a function, you can # use a class for example). The first argument passed to the function - # is a dictionary containing CGI-style envrironment variables and the + # is a dictionary containing CGI-style environment variables and the # second variable is the callable object (see PEP 333). def hello_world_app(environ, start_response): status = '200 OK' # HTTP Status diff -r 49abb3985db3 Include/object.h --- a/Include/object.h Mon Apr 13 16:32:16 2015 -0400 +++ b/Include/object.h Tue Apr 14 03:27:51 2015 +0200 @@ -782,7 +782,7 @@ } while (0) /* Safely decref `op` and set `op` to NULL, especially useful in tp_clear - * and tp_dealloc implementatons. + * and tp_dealloc implementations. * * Note that "the obvious" code can be deadly: * diff -r 49abb3985db3 Include/pyport.h --- a/Include/pyport.h Mon Apr 13 16:32:16 2015 -0400 +++ b/Include/pyport.h Tue Apr 14 03:27:51 2015 +0200 @@ -270,7 +270,7 @@ * for platforms that support that. * * If PY_LOCAL_AGGRESSIVE is defined before python.h is included, more - * "aggressive" inlining/optimizaion is enabled for the entire module. This + * "aggressive" inlining/optimization is enabled for the entire module. This * may lead to code bloat, and may slow things down for those reasons. It may * also lead to errors, if the code relies on pointer aliasing. Use with * care. diff -r 49abb3985db3 Lib/idlelib/SearchEngine.py --- a/Lib/idlelib/SearchEngine.py Mon Apr 13 16:32:16 2015 -0400 +++ b/Lib/idlelib/SearchEngine.py Tue Apr 14 03:27:51 2015 +0200 @@ -107,7 +107,7 @@ It directly return the result of that call. Text is a text widget. Prog is a precompiled pattern. - The ok parameteris a bit complicated as it has two effects. + The ok parameter is a bit complicated as it has two effects. If there is a selection, the search begin at either end, depending on the direction setting and ok, with ok meaning that diff -r 49abb3985db3 Lib/idlelib/idle_test/mock_tk.py --- a/Lib/idlelib/idle_test/mock_tk.py Mon Apr 13 16:32:16 2015 -0400 +++ b/Lib/idlelib/idle_test/mock_tk.py Tue Apr 14 03:27:51 2015 +0200 @@ -1,6 +1,6 @@ """Classes that replace tkinter gui objects used by an object being tested. -A gui object is anything with a master or parent paramenter, which is +A gui object is anything with a master or parent parameter, which is typically required in spite of what the doc strings say. """ diff -r 49abb3985db3 Lib/test/decimaltestdata/exp.decTest --- a/Lib/test/decimaltestdata/exp.decTest Mon Apr 13 16:32:16 2015 -0400 +++ b/Lib/test/decimaltestdata/exp.decTest Tue Apr 14 03:27:51 2015 +0200 @@ -19,7 +19,7 @@ ------------------------------------------------------------------------ version: 2.59 --- Tests of the exponential funtion. Currently all testcases here +-- Tests of the exponential function. Currently all testcases here -- show results which are correctly rounded (within <= 0.5 ulp). extended: 1 diff -r 49abb3985db3 Lib/test/script_helper.py --- a/Lib/test/script_helper.py Mon Apr 13 16:32:16 2015 -0400 +++ b/Lib/test/script_helper.py Tue Apr 14 03:27:51 2015 +0200 @@ -34,7 +34,7 @@ doesn't have an obvious home with Python's current home finding logic. Setting PYTHONHOME is one way to get most of the testsuite to run in that - situation. PYTHONPATH or PYTHONUSERSITE are other common envirnonment + situation. PYTHONPATH or PYTHONUSERSITE are other common environment variables that might impact whether or not the interpreter can start. """ global __cached_interp_requires_environment diff -r 49abb3985db3 Lib/test/test_doctest.py --- a/Lib/test/test_doctest.py Mon Apr 13 16:32:16 2015 -0400 +++ b/Lib/test/test_doctest.py Tue Apr 14 03:27:51 2015 +0200 @@ -2174,7 +2174,7 @@ ... AttributeError: module 'test.test_doctest' has no attribute 'sillySetup' - The setUp and tearDown funtions are passed test objects. Here + The setUp and tearDown functions are passed test objects. Here we'll use the setUp function to supply the missing variable y: >>> def setUp(test): @@ -2320,7 +2320,7 @@ ... AttributeError: module 'test.test_doctest' has no attribute 'sillySetup' - The setUp and tearDown funtions are passed test objects. + The setUp and tearDown functions are passed test objects. Here, we'll use a setUp function to set the favorite color in test_doctest.txt: diff -r 49abb3985db3 Lib/test/test_email/__init__.py --- a/Lib/test/test_email/__init__.py Mon Apr 13 16:32:16 2015 -0400 +++ b/Lib/test/test_email/__init__.py Tue Apr 14 03:27:51 2015 +0200 @@ -87,7 +87,7 @@ element tuples. However derived, the resulting sequence is passed via *args to the parameterized test function. - In a _params dictioanry, the keys become part of the name of the generated + In a _params dictionary, the keys become part of the name of the generated tests. In a _params list, the values in the list are converted into a string by joining the string values of the elements of the tuple by '_' and converting any blanks into '_'s, and this become part of the name. diff -r 49abb3985db3 Lib/test/test_socket.py --- a/Lib/test/test_socket.py Mon Apr 13 16:32:16 2015 -0400 +++ b/Lib/test/test_socket.py Tue Apr 14 03:27:51 2015 +0200 @@ -709,7 +709,7 @@ raise socket.gaierror def testSendtoErrors(self): - # Testing that sendto doens't masks failures. See #10169. + # Testing that sendto doesn't masks failures. See #10169. s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.addCleanup(s.close) s.bind(('', 0)) diff -r 49abb3985db3 Lib/test/test_threading.py --- a/Lib/test/test_threading.py Mon Apr 13 16:32:16 2015 -0400 +++ b/Lib/test/test_threading.py Tue Apr 14 03:27:51 2015 +0200 @@ -629,7 +629,7 @@ def generator(): while 1: - yield "genereator" + yield "generator" def callback(): if callback.gen is None: diff -r 49abb3985db3 Lib/tkinter/__init__.py --- a/Lib/tkinter/__init__.py Mon Apr 13 16:32:16 2015 -0400 +++ b/Lib/tkinter/__init__.py Tue Apr 14 03:27:51 2015 +0200 @@ -1736,7 +1736,7 @@ On X, the images are arranged into the _NET_WM_ICON X property, which most modern window managers support. An icon specified by - wm_iconbitmap may exist simuultaneously. + wm_iconbitmap may exist simultaneously. On Macintosh, this currently does nothing.""" if default: diff -r 49abb3985db3 Misc/HISTORY --- a/Misc/HISTORY Mon Apr 13 16:32:16 2015 -0400 +++ b/Misc/HISTORY Tue Apr 14 03:27:51 2015 +0200 @@ -21545,7 +21545,7 @@ Bow to font-lock at the end of the docstring, since it throws stuff off. - Make sure the path paramter to readmodule() is a list before adding it + Make sure the path parameter to readmodule() is a list before adding it with sys.path, or the addition could fail. @@ -23597,7 +23597,7 @@ - The warning about a thread still having a frame now only happens in verbose mode. -- Change the signal finialization so that it also resets the signal +- Change the signal finalization so that it also resets the signal handlers. After this has been called, our signal handlers are no longer active! @@ -25449,7 +25449,7 @@ fixed. - The test of negative number to the float power has been moved from the -built-in pow() functin to floatobject.c (so complex numbers can yield the +built-in pow() function to floatobject.c (so complex numbers can yield the correct result). - The bug introduced in beta2 where shared libraries loaded (using diff -r 49abb3985db3 Misc/NEWS --- a/Misc/NEWS Mon Apr 13 16:32:16 2015 -0400 +++ b/Misc/NEWS Tue Apr 14 03:27:51 2015 +0200 @@ -1097,7 +1097,7 @@ (including empty directories) in ZIP file. - Issue #22449: In the ssl.SSLContext.load_default_certs, consult the - enviromental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows. + environmental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows. - Issue #22508: The email.__version__ variable has been removed; the email code is no longer shipped separately from the stdlib, and __version__ diff -r 49abb3985db3 Modules/_ctypes/_ctypes.c --- a/Modules/_ctypes/_ctypes.c Mon Apr 13 16:32:16 2015 -0400 +++ b/Modules/_ctypes/_ctypes.c Tue Apr 14 03:27:51 2015 +0200 @@ -3863,7 +3863,7 @@ self, callargs, NULL); - /* If the errcheck funtion failed, return NULL. + /* If the errcheck function failed, return NULL. If the errcheck function returned callargs unchanged, continue normal processing. If the errcheck function returned something else, diff -r 49abb3985db3 Modules/_ctypes/ctypes.h --- a/Modules/_ctypes/ctypes.h Mon Apr 13 16:32:16 2015 -0400 +++ b/Modules/_ctypes/ctypes.h Tue Apr 14 03:27:51 2015 +0200 @@ -191,7 +191,7 @@ remember is that in PyCArrayType_new the ffi_type fields must be filled in - so far it was unneeded because libffi doesn't support arrays at all (because they are passed as pointers to function calls anyway). But it's - too much risk to change that now, and there are other fields which doen't + too much risk to change that now, and there are other fields which doesn't belong into this structure anyway. Maybe in ctypes 2.0... (ctypes 2000?) */ Py_ssize_t size; /* number of bytes */ diff -r 49abb3985db3 Modules/_ctypes/libffi/ltmain.sh --- a/Modules/_ctypes/libffi/ltmain.sh Mon Apr 13 16:32:16 2015 -0400 +++ b/Modules/_ctypes/libffi/ltmain.sh Tue Apr 14 03:27:51 2015 +0200 @@ -1438,7 +1438,7 @@ case " $hookable_fns " in *" $1 "*) ;; - *) func_fatal_error "'$1' does not support hook funcions.n" ;; + *) func_fatal_error "'$1' does not support hook functions." ;; esac eval _G_hook_fns=\$$1_hooks; shift