diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-12-18 05:41:55 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-12-18 05:41:55 (GMT) |
| commit | fc29c88b5f299f0fad9919dd92628f810b4b4711 (patch) | |
| tree | ffb98421a6dcb7414bc943d008674b0e440c57de /Doc | |
| parent | 3e8d9413eb6b5126de3181c30ed3edea399d4934 (diff) | |
| parent | 59b0eb524f6b476db0805ba0a83661122a3fa2fe (diff) | |
| download | cpython-fc29c88b5f299f0fad9919dd92628f810b4b4711.zip cpython-fc29c88b5f299f0fad9919dd92628f810b4b4711.tar.gz cpython-fc29c88b5f299f0fad9919dd92628f810b4b4711.tar.bz2 | |
Issue #28987: Merge doc and comment fixes from 3.6
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/shutil.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/3.6.rst | 2 |
2 files changed, 2 insertions, 2 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/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index 922ee64..a3c3d89 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 |