diff options
author | Martin Panter <vadmium+py@gmail.com> | 2016-06-12 06:16:51 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2016-06-12 06:16:51 (GMT) |
commit | aea671efc61e89c93be8d0a6866bd4ee3ff7d058 (patch) | |
tree | 60b4e2fc7cb78b30faceab4cd50692a5db372ee1 | |
parent | 50d4c15ba78615ce5a8e05a0ae665570fd249463 (diff) | |
parent | 70c502aacf629bd470a88dc5f139937d62376143 (diff) | |
download | cpython-aea671efc61e89c93be8d0a6866bd4ee3ff7d058.zip cpython-aea671efc61e89c93be8d0a6866bd4ee3ff7d058.tar.gz cpython-aea671efc61e89c93be8d0a6866bd4ee3ff7d058.tar.bz2 |
Merge typo fixes from 3.5
-rw-r--r-- | Doc/whatsnew/2.0.rst | 2 | ||||
-rw-r--r-- | Lib/test/test_coroutines.py | 2 | ||||
-rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst index 87462f3..4d49af1 100644 --- a/Doc/whatsnew/2.0.rst +++ b/Doc/whatsnew/2.0.rst @@ -506,7 +506,7 @@ arguments and/or a dictionary of keyword arguments. In Python 1.5 and earlier, you'd use the :func:`apply` built-in function: ``apply(f, args, kw)`` calls the function :func:`f` with the argument tuple *args* and the keyword arguments in the dictionary *kw*. :func:`apply` is the same in 2.0, but thanks to a patch -from Greg Ewing, ``f(*args, **kw)`` as a shorter and clearer way to achieve the +from Greg Ewing, ``f(*args, **kw)`` is a shorter and clearer way to achieve the same effect. This syntax is symmetrical with the syntax for defining functions:: diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index 4f725ae..d0cefb0 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -1423,7 +1423,7 @@ class CoroutineTest(unittest.TestCase): with warnings.catch_warnings(): warnings.simplefilter("error") - # Test that __aiter__ that returns an asyncronous iterator + # Test that __aiter__ that returns an asynchronous iterator # directly does not throw any warnings. run_async(main()) self.assertEqual(I, 111011) @@ -3040,8 +3040,8 @@ Library writer failed in BufferedRWPair.close(). - Issue #23622: Unknown escapes in regular expressions that consist of ``'\'`` - and ASCII letter now raise a deprecation warning and will be forbidden in - Python 3.6. + and an ASCII letter now raise a deprecation warning and will be forbidden + in Python 3.6. - Issue #23671: string.Template now allows specifying the "self" parameter as a keyword argument. string.Formatter now allows specifying the "self" and |