From 4882cacab6bcaf90ac496fc8878987598e7665c1 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Tue, 14 Apr 2015 09:30:01 +0300 Subject: [PATCH] Issue #23943: Fix typos. Patch by Piotr Kasprzyk. --- Doc/library/email.contentmanager.rst | 2 +- Doc/library/threading.rst | 2 +- Doc/library/wsgiref.rst | 2 +- Include/object.h | 2 +- Include/pyport.h | 2 +- Lib/idlelib/SearchEngine.py | 2 +- Lib/idlelib/idle_test/mock_tk.py | 2 +- Lib/test/decimaltestdata/exp.decTest | 2 +- Lib/test/script_helper.py | 2 +- Lib/test/test_doctest.py | 4 ++-- Lib/test/test_email/__init__.py | 2 +- Lib/test/test_socket.py | 2 +- Lib/test/test_threading.py | 2 +- Lib/tkinter/__init__.py | 2 +- Misc/HISTORY | 6 +++--- Misc/NEWS | 2 +- Modules/_ctypes/_ctypes.c | 2 +- Modules/_ctypes/ctypes.h | 2 +- Modules/_ctypes/libffi/ltmain.sh | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Doc/library/email.contentmanager.rst b/Doc/library/email.contentmanager.rst index 8f33a146dd8..f53d34b34cb 100644 --- a/Doc/library/email.contentmanager.rst +++ b/Doc/library/email.contentmanager.rst @@ -425,7 +425,7 @@ Currently the email package provides only one concrete content manager, *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 --git a/Doc/library/threading.rst b/Doc/library/threading.rst index f59ffe582f9..0133a8f5e71 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -874,7 +874,7 @@ This class provides a simple synchronization primitive for use by a fixed number 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 --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst index 1cef2e9464e..a9e19dad982 100644 --- a/Doc/library/wsgiref.rst +++ b/Doc/library/wsgiref.rst @@ -754,7 +754,7 @@ This is a working "Hello World" WSGI application:: # 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 --git a/Include/object.h b/Include/object.h index 93062889a75..5f862ab6e9f 100644 --- a/Include/object.h +++ b/Include/object.h @@ -779,7 +779,7 @@ PyAPI_FUNC(void) _Py_Dealloc(PyObject *); } 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 --git a/Include/pyport.h b/Include/pyport.h index c706213c87c..b29f9bd9291 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -270,7 +270,7 @@ typedef int Py_ssize_clean_t; * 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 --git a/Lib/idlelib/SearchEngine.py b/Lib/idlelib/SearchEngine.py index 1e0534c085d..37883bf687c 100644 --- a/Lib/idlelib/SearchEngine.py +++ b/Lib/idlelib/SearchEngine.py @@ -107,7 +107,7 @@ class SearchEngine: 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 --git a/Lib/idlelib/idle_test/mock_tk.py b/Lib/idlelib/idle_test/mock_tk.py index a8030f4f5ca..86fe84884fb 100644 --- a/Lib/idlelib/idle_test/mock_tk.py +++ b/Lib/idlelib/idle_test/mock_tk.py @@ -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 --git a/Lib/test/decimaltestdata/exp.decTest b/Lib/test/decimaltestdata/exp.decTest index 021b478ac2e..6a7af23b625 100644 --- a/Lib/test/decimaltestdata/exp.decTest +++ b/Lib/test/decimaltestdata/exp.decTest @@ -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 --git a/Lib/test/script_helper.py b/Lib/test/script_helper.py index b31fc40013e..b29392ff0a6 100644 --- a/Lib/test/script_helper.py +++ b/Lib/test/script_helper.py @@ -34,7 +34,7 @@ def _interpreter_requires_environment(): 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 --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index 74d512d3221..9292d922784 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -2170,7 +2170,7 @@ def test_DocTestSuite(): ... AttributeError: 'module' object 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): @@ -2316,7 +2316,7 @@ def test_DocFileSuite(): ... AttributeError: 'module' object 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 --git a/Lib/test/test_email/__init__.py b/Lib/test/test_email/__init__.py index a59775c4ff5..d2f7d319342 100644 --- a/Lib/test/test_email/__init__.py +++ b/Lib/test/test_email/__init__.py @@ -87,7 +87,7 @@ def parameterize(cls): 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 --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 0db760f64e5..c8a36236759 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -707,7 +707,7 @@ class GeneralModuleTests(unittest.TestCase): 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 --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 98f01ee42ac..4b75ea67782 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -629,7 +629,7 @@ class ThreadTests(BaseTestCase): def generator(): while 1: - yield "genereator" + yield "generator" def callback(): if callback.gen is None: diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 234306431b7..21a560b5bfd 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -1734,7 +1734,7 @@ class Wm: 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 --git a/Misc/HISTORY b/Misc/HISTORY index 8370d8e4c9a..f48375931ab 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -21512,7 +21512,7 @@ Thu Feb 18 20:51:50 1999 Fred Drake 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. @@ -23564,7 +23564,7 @@ an underscore and used to initialize the pointer. - 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! @@ -25416,7 +25416,7 @@ some more documentation. 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 --git a/Misc/NEWS b/Misc/NEWS index 6ed85efc484..a38f395ad00 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -465,7 +465,7 @@ Library (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 #20076: Added non derived UTF-8 aliases to locale aliases table. diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 558abe39863..2e5939c2571 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3862,7 +3862,7 @@ PyCFuncPtr_call(PyCFuncPtrObject *self, PyObject *inargs, PyObject *kwds) 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 --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h index de6c7649117..0d3f7241ca8 100644 --- a/Modules/_ctypes/ctypes.h +++ b/Modules/_ctypes/ctypes.h @@ -191,7 +191,7 @@ typedef struct { 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 --git a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh index a50a21a67ca..059598045ef 100644 --- a/Modules/_ctypes/libffi/ltmain.sh +++ b/Modules/_ctypes/libffi/ltmain.sh @@ -1438,7 +1438,7 @@ func_run_hooks () 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