diff options
-rw-r--r-- | Doc/library/shutil.rst | 2 | ||||
-rw-r--r-- | Doc/whatsnew/3.6.rst | 2 | ||||
-rw-r--r-- | Lib/distutils/tests/test_bdist_rpm.py | 2 | ||||
-rw-r--r-- | Lib/test/test_unicode.py | 2 | ||||
-rw-r--r-- | Misc/HISTORY | 2 | ||||
-rw-r--r-- | Misc/NEWS | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index ca01b93d3f..3451597bc1 100644 --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -581,7 +581,7 @@ provided. They rely on the :mod:`zipfile` and :mod:`tarfile` modules. 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 index 922ee64619..a3c3d89424 100644 --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -360,7 +360,7 @@ ensure that the new ``__classcell__`` namespace entry is propagated to 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 index d7c9feb32f..6453a02b88 100644 --- a/Lib/distutils/tests/test_bdist_rpm.py +++ b/Lib/distutils/tests/test_bdist_rpm.py @@ -94,7 +94,7 @@ class BuildRpmTestCase(support.TempdirManager, @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 index 0737140ccf..883c362a03 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -2639,7 +2639,7 @@ class CAPITest(unittest.TestCase): 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 index 6cadaecf87..73ec9264ab 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -6495,7 +6495,7 @@ Core and Builtins 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. @@ -23,14 +23,14 @@ Core and Builtins 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 @@ Library 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 |