[Python-checkins] cpython (merge 3.6 -> default): Issue #28987: Merge doc and comment fixes from 3.6

Sun Dec 18 00:43:53 EST 2016

https://hg.python.org/cpython/rev/28cf4ffcfbf3
changeset: 105725:28cf4ffcfbf3
parent: 105720:c016ab381894
parent: 105724:a46a20a1f286
user: Martin Panter <vadmium+py at gmail.com>
date: Sun Dec 18 05:41:55 2016 +0000
summary:
 Issue #28987: Merge doc and comment fixes from 3.6
files:
 Doc/library/shutil.rst | 2 +-
 Doc/whatsnew/3.6.rst | 2 +-
 Lib/distutils/tests/test_bdist_rpm.py | 2 +-
 Lib/test/test_unicode.py | 2 +-
 Misc/HISTORY | 2 +-
 Misc/NEWS | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -581,7 +581,7 @@
 
 By default :mod:`shutil` provides these formats:
 
- - *zip*: ZIP file (unpacking compressed files works only if corresponding
+ - *zip*: ZIP file (unpacking compressed files works only if the corresponding
 module is available).
 - *tar*: uncompressed tar file.
 - *gztar*: gzip'ed tar-file (if the :mod:`zlib` module is available).
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -360,7 +360,7 @@
 PEP 487: Descriptor Protocol Enhancements
 -----------------------------------------
 
-:pep:`487` extends the descriptor protocol has to include the new optional
+:pep:`487` extends the descriptor protocol to include the new optional
 :meth:`~object.__set_name__` method. Whenever a new class is defined, the new
 method will be called on all descriptors included in the definition, providing
 them with a reference to the class being defined and the name given to the
diff --git a/Lib/distutils/tests/test_bdist_rpm.py b/Lib/distutils/tests/test_bdist_rpm.py
--- a/Lib/distutils/tests/test_bdist_rpm.py
+++ b/Lib/distutils/tests/test_bdist_rpm.py
@@ -94,7 +94,7 @@
 @unittest.skipIf(find_executable('rpmbuild') is None,
 'the rpmbuild command is not found')
 def test_no_optimize_flag(self):
- # let's create a package that brakes bdist_rpm
+ # let's create a package that breaks bdist_rpm
 tmp_dir = self.mkdtemp()
 os.environ['HOME'] = tmp_dir # to confine dir '.rpmdb' creation
 pkg_dir = os.path.join(tmp_dir, 'foo')
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -2639,7 +2639,7 @@
 b'repr=%V', None, b'abc\xff')
 
 # not supported: copy the raw format string. these tests are just here
- # to check for crashs and should not be considered as specifications
+ # to check for crashes and should not be considered as specifications
 check_format('%s',
 b'%1%s', b'abc')
 check_format('%1abc',
diff --git a/Misc/HISTORY b/Misc/HISTORY
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -6495,7 +6495,7 @@
 NULL).
 
 - Issue #10829: Refactor PyUnicode_FromFormat(), use the same function to parse
- the format string in the 3 steps, fix crashs on invalid format strings.
+ the format string in the 3 steps, fix crashes on invalid format strings.
 
 - Issue #13007: whichdb should recognize gdbm 1.9 magic numbers.
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,14 +23,14 @@
 to/from UTF-8, instead of the locale encoding to avoid inconsistencies with
 os.fsencode() and os.fsdecode() which are already using UTF-8.
 
-- Issue #28991: functools.lru_cache() was susceptible to an obscure $
+- Issue #28991: functools.lru_cache() was susceptible to an obscure reentrancy
 bug triggerable by a monkey-patched len() function.
 
 - Issue #28147: Fix a memory leak in split-table dictionaries: setattr()
 must not convert combined table into split table. Patch written by INADA
 Naoki.
 
-- Issue #28739: f-string expressions no longer accepted as docstrings and
+- Issue #28739: f-string expressions are no longer accepted as docstrings and
 by ast.literal_eval() even if they do not include expressions.
 
 - Issue #28512: Fixed setting the offset attribute of SyntaxError by
@@ -497,7 +497,7 @@
 Windows
 -------
 
-- Issue #25778: winreg does not truncase string correctly (Patch by Eryk Sun)
+- Issue #25778: winreg does not truncate string correctly (Patch by Eryk Sun)
 
 - Issue #28896: Deprecate WindowsRegistryFinder and disable it by default
 
-- 
Repository URL: https://hg.python.org/cpython
