summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-07-05 22:00:43 (GMT)
committerGitHub <noreply@github.com>2019-07-05 22:00:43 (GMT)
commit4bc6bb928d35b4007f2dcb32523624a3205e0e46 (patch)
tree2cae224a7c45616851d841162105d20fba104b9d
parent229f6e85f8b4d57a2e742e0d3fc361c5bd15f1cb (diff)
downloadcpython-4bc6bb928d35b4007f2dcb32523624a3205e0e46.zip
cpython-4bc6bb928d35b4007f2dcb32523624a3205e0e46.tar.gz
cpython-4bc6bb928d35b4007f2dcb32523624a3205e0e46.tar.bz2
Fix some typos (GH-14435)
(cherry picked from commit f7d72e48fb235684e17668a1e5107e6b0dab7b80) Co-authored-by: Min ho Kim <minho42@gmail.com>
-rw-r--r--Misc/NEWS.d/3.8.0a1.rst6
-rw-r--r--Misc/NEWS.d/3.8.0a3.rst2
-rw-r--r--Misc/NEWS.d/3.8.0b1.rst2
-rw-r--r--Modules/_abc.c4
-rw-r--r--Modules/mathmodule.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/Misc/NEWS.d/3.8.0a1.rst b/Misc/NEWS.d/3.8.0a1.rst
index f4b0a04..84c2a6c 100644
--- a/Misc/NEWS.d/3.8.0a1.rst
+++ b/Misc/NEWS.d/3.8.0a1.rst
@@ -550,7 +550,7 @@ The *lineno* and *col_offset* attributes of the AST for decorated function
and class refer now to the position of the corresponding ``def``, ``async
def`` and ``class`` instead of the position of the first decorator. This
leads to more correct line reporting in tracing. This is the only case when
-the position of child AST nodes can preceed the position of the parent AST
+the position of child AST nodes can precede the position of the parent AST
node.
..
@@ -2366,7 +2366,7 @@ running external programs like ``cmd /c ver``.
Previously, calling the strftime() method on a datetime object with a
trailing '%' in the format string would result in an exception. However,
-this only occured when the datetime C module was being used; the python
+this only occurred when the datetime C module was being used; the python
implementation did not match this behavior. Datetime is now PEP-399
compliant, and will not throw an exception on a trailing '%'.
@@ -5278,7 +5278,7 @@ Improved error handling and fixed a reference leak in
.. nonce: zncfvW
.. section: Library
-Deleting a key from a read-only dbm database raises module specfic error
+Deleting a key from a read-only dbm database raises module specific error
instead of KeyError.
..
diff --git a/Misc/NEWS.d/3.8.0a3.rst b/Misc/NEWS.d/3.8.0a3.rst
index a7397b5..fc37b22 100644
--- a/Misc/NEWS.d/3.8.0a3.rst
+++ b/Misc/NEWS.d/3.8.0a3.rst
@@ -173,7 +173,7 @@ Update Unicode databases to version 12.0.0.
.. nonce: dZemNt
.. section: Core and Builtins
-Fix a segfault occuring when sorting a list of heterogeneous values. Patch
+Fix a segfault occurring when sorting a list of heterogeneous values. Patch
contributed by RĂ©mi Lapeyre and Elliot Gorokhovsky.
..
diff --git a/Misc/NEWS.d/3.8.0b1.rst b/Misc/NEWS.d/3.8.0b1.rst
index 77f57df..3cebcfb 100644
--- a/Misc/NEWS.d/3.8.0b1.rst
+++ b/Misc/NEWS.d/3.8.0b1.rst
@@ -1613,7 +1613,7 @@ versions.
.. section: Documentation
Improve documentation of the stdin, stdout, and stderr arguments of of the
-``asyncio.subprocess_exec`` function to specficy which values are supported.
+``asyncio.subprocess_exec`` function to specify which values are supported.
Also mention that decoding as text is not supported.
Add a few tests to verify that the various values passed to the std*
diff --git a/Modules/_abc.c b/Modules/_abc.c
index 1fbf3a8..de938dd 100644
--- a/Modules/_abc.c
+++ b/Modules/_abc.c
@@ -547,7 +547,7 @@ end:
}
-// Return -1 when exception occured.
+// Return -1 when exception occurred.
// Return 1 when result is set.
// Return 0 otherwise.
static int subclasscheck_check_registry(_abc_data *impl, PyObject *subclass,
@@ -659,7 +659,7 @@ _abc__abc_subclasscheck_impl(PyObject *module, PyObject *self,
/* 5. Check if it's a subclass of a registered class (recursive). */
if (subclasscheck_check_registry(impl, subclass, &result)) {
- // Exception occured or result is set.
+ // Exception occurred or result is set.
goto end;
}
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
index 82a9a14..dd596c8 100644
--- a/Modules/mathmodule.c
+++ b/Modules/mathmodule.c
@@ -1552,7 +1552,7 @@ prove that after that line is executed, we have
(a - 1)**2 < (n >> 2*(c - d)) < (a + 1)**2
-To faciliate the proof, we make some changes of notation. Write `m` for
+To facilitate the proof, we make some changes of notation. Write `m` for
`n >> 2*(c-d)`, and write `b` for the new value of `a`, so
b = (a << d - e - 1) + (n >> 2*c - e - d + 1) // a