[Python-checkins] cpython (2.7): Issue #23943: Fix typos. Patch by Piotr Kasprzyk.

martin.panter python-checkins at python.org
Thu Jul 28 00:20:02 EDT 2016


https://hg.python.org/cpython/rev/b0addbbc7671
changeset:   102471:b0addbbc7671
branch:      2.7
user:        Martin Panter <vadmium+py at gmail.com>
date:        Thu Jul 28 03:04:04 2016 +0000
summary:
  Issue #23943: Fix typos. Patch by Piotr Kasprzyk.

files:
  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 |  1 +
  Lib/test/test_doctest.py             |  4 ++--
  Lib/test/test_socket.py              |  2 +-
  Lib/test/test_threading.py           |  2 +-
  Misc/HISTORY                         |  6 +++---
  Misc/NEWS                            |  2 +-
  Misc/cheatsheet                      |  4 ++--
  Modules/_ctypes/_ctypes.c            |  2 +-
  Modules/_ctypes/ctypes.h             |  2 +-
  Modules/_ctypes/libffi/ltmain.sh     |  2 +-
  15 files changed, 19 insertions(+), 18 deletions(-)


diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst
--- a/Doc/library/wsgiref.rst
+++ b/Doc/library/wsgiref.rst
@@ -711,7 +711,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 --git a/Include/object.h b/Include/object.h
--- a/Include/object.h
+++ b/Include/object.h
@@ -778,7 +778,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 --git a/Include/pyport.h b/Include/pyport.h
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -265,7 +265,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 --git a/Lib/idlelib/SearchEngine.py b/Lib/idlelib/SearchEngine.py
--- a/Lib/idlelib/SearchEngine.py
+++ b/Lib/idlelib/SearchEngine.py
@@ -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 --git a/Lib/idlelib/idle_test/mock_tk.py b/Lib/idlelib/idle_test/mock_tk.py
--- 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
--- 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
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -2113,7 +2113,7 @@
          ...
          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 @@
          ...
          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
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -299,7 +299,7 @@
                               "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
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -739,7 +739,7 @@
 
         def generator():
             while 1:
-                yield "genereator"
+                yield "generator"
 
         def callback():
             if callback.gen is None:
diff --git a/Misc/HISTORY b/Misc/HISTORY
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -10633,7 +10633,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.
 
 
@@ -12685,7 +12685,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!
 
@@ -14537,7 +14537,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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1338,7 +1338,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 #8473: doctest.testfile now uses universal newline mode to read
   the test file.
diff --git a/Misc/cheatsheet b/Misc/cheatsheet
--- a/Misc/cheatsheet
+++ b/Misc/cheatsheet
@@ -975,7 +975,7 @@
 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 @@
                     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
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -3985,7 +3985,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 --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h
--- a/Modules/_ctypes/ctypes.h
+++ b/Modules/_ctypes/ctypes.h
@@ -229,7 +229,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 --git a/Modules/_ctypes/libffi/ltmain.sh b/Modules/_ctypes/libffi/ltmain.sh
--- a/Modules/_ctypes/libffi/ltmain.sh
+++ b/Modules/_ctypes/libffi/ltmain.sh
@@ -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

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list