From: Martin Panter Date: Thu, 28 Jul 2016 03:04:04 +0000 (+0000) Subject: Issue #23943: Fix typos. Patch by Piotr Kasprzyk. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2eacc02bcc9f8977f5f3cea6243f236c508b772;p=python Issue #23943: Fix typos. Patch by Piotr Kasprzyk. --- diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst index e755d18184..b8b48831de 100644 --- a/Doc/library/wsgiref.rst +++ b/Doc/library/wsgiref.rst @@ -711,7 +711,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 9fc05831f9..807b24188a 100644 --- a/Include/object.h +++ b/Include/object.h @@ -778,7 +778,7 @@ PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force); } 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 85e852f8b0..2259548ea8 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -265,7 +265,7 @@ typedef Py_intptr_t Py_ssize_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 963dfd39fe..ad431300e5 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 612ea1a6f1..f42a039711 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 eab990d3ef..cf8882ff1e 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/test_doctest.py b/Lib/test/test_doctest.py index 7cf7d06fd2..354c33baa9 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -2113,7 +2113,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): @@ -2259,7 +2259,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_socket.py b/Lib/test/test_socket.py index fe79b829fd..d784aeade8 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -299,7 +299,7 @@ class GeneralModuleTests(unittest.TestCase): "Error raising socket exception.") 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 ac14e66ad4..4c21e6baa7 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -739,7 +739,7 @@ class ThreadJoinOnShutdown(BaseTestCase): def generator(): while 1: - yield "genereator" + yield "generator" def callback(): if callback.gen is None: diff --git a/Misc/HISTORY b/Misc/HISTORY index ae5c643a58..73efb3e7a0 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -10633,7 +10633,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. @@ -12685,7 +12685,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! @@ -14537,7 +14537,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 0676ff841a..5494aaca14 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1338,7 +1338,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 #8473: doctest.testfile now uses universal newline mode to read the test file. diff --git a/Misc/cheatsheet b/Misc/cheatsheet index 0867079b5b..d4eeda6bea 100644 --- a/Misc/cheatsheet +++ b/Misc/cheatsheet @@ -975,7 +975,7 @@ hex(x) Converts a number x to a hexadecimal string. id(object) Returns a unique 'identity' integer for an object. input([prompt]) Prints prompt if given. Reads input and evaluates it. Converts a number or a string to a plain integer. Optional -int(x[, base]) base paramenter specifies base from which to convert string +int(x[, base]) base parameter specifies base from which to convert string values. intern(aString) Enters aString in the table of "interned strings" andreturns the string. Interned strings are 'immortals'. @@ -991,7 +991,7 @@ list(sequence) Converts sequence into a list. If already a list,returns a copy of it. locals() Returns a dictionary containing current local variables. Converts a number or a string to a long integer. Optional -long(x[, base]) base paramenter specifies base from which to convert string +long(x[, base]) base parameter specifies base from which to convert string values. Applies function to every item of list and returns a listof map(function, list, the results. If additional arguments are passed,function diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index b7e47fa350..f12a7b2bcf 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3985,7 +3985,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 a61ce5f326..394534bff5 100644 --- a/Modules/_ctypes/ctypes.h +++ b/Modules/_ctypes/ctypes.h @@ -229,7 +229,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 a50a21a67c..059598045e 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