diff --git a/Misc/NEWS.d/3.8.0a1.rst b/Misc/NEWS.d/3.8.0a1.rst index f4b0a048330..84c2a6c12bc 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 a7397b520cb..fc37b22ddb1 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 77f57df397a..3cebcfb587c 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 7233690a57d..219ea0dd628 100644 --- a/Modules/_abc.c +++ b/Modules/_abc.c @@ -554,7 +554,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, @@ -666,7 +666,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 a75a3c929e7..552cb78c88d 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