diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-12-18 05:37:21 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-12-18 05:37:21 (GMT) |
| commit | fff07e34fab1d70b09458fcb351da84fd866c0f9 (patch) | |
| tree | 2827fbdd3aea5c09bf85ab5d7b5d14f663be9e7b | |
| parent | d4f813227891dfd1725bf330b0a25a477c8e16ac (diff) | |
| parent | 2f9171d9008dea8db9183041dab71d8ef1edb844 (diff) | |
| download | cpython-fff07e34fab1d70b09458fcb351da84fd866c0f9.zip cpython-fff07e34fab1d70b09458fcb351da84fd866c0f9.tar.gz cpython-fff07e34fab1d70b09458fcb351da84fd866c0f9.tar.bz2 | |
Merge spelling and grammar from 3.5
| -rw-r--r-- | Doc/library/shutil.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 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index ca01b93..3451597 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/Lib/distutils/tests/test_bdist_rpm.py b/Lib/distutils/tests/test_bdist_rpm.py index d7c9feb..6453a02 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 0737140..883c362 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 88cb286..9655d4c 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -2194,7 +2194,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. |