diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-11-20 22:18:08 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-11-20 22:18:08 (GMT) |
| commit | 439f92ae3d46c7593159f5bb13d5a95495c2b4e7 (patch) | |
| tree | 23926a9eefa3d8eb596f0044a288adec426a60db | |
| parent | 7d6e9232b142cd85a683a195f614bc2f09751934 (diff) | |
| parent | cf014413159c1fa2e8b1c1201c07b648b8b0adf2 (diff) | |
| download | cpython-439f92ae3d46c7593159f5bb13d5a95495c2b4e7.zip cpython-439f92ae3d46c7593159f5bb13d5a95495c2b4e7.tar.gz cpython-439f92ae3d46c7593159f5bb13d5a95495c2b4e7.tar.bz2 | |
Merge typo fixes from 3.6
| -rw-r--r-- | Doc/library/email.message.rst | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst index 95136d2..32852e7 100644 --- a/Doc/library/email.message.rst +++ b/Doc/library/email.message.rst @@ -275,7 +275,7 @@ message objects. only the key will be added. If the value contains non-ASCII characters, the charset and language may - be explicitly controlled by specifing the value as a three tuple in the + be explicitly controlled by specifying the value as a three tuple in the format ``(CHARSET, LANGUAGE, VALUE)``, where ``CHARSET`` is a string naming the charset to be used to encode the value, ``LANGUAGE`` can usually be set to ``None`` or the empty string (see :rfc:`2231` for other @@ -295,7 +295,7 @@ Library if pass invalid string-like object as a name. Patch by Xiang Zhang. - Issue #18844: random.choices() now has k as a keyword-only argument - to improve the readability of common cases and the come into line + to improve the readability of common cases and come into line with the signature used in other languages. - Issue #18893: Fix invalid exception handling in Lib/ctypes/macholib/dyld.py. |