merge with 3.4

2014-10-31 10:54:10 +01:00 · 2014-10-31 10:54:10 +01:00 · 455de40a6e
parent e21a531ef1 36ac510956
commit 455de40a6e
1 changed files with 1 additions and 1 deletions
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@ -491,7 +491,7 @@ provided.  They rely on the :mod:`zipfile` and :mod:`tarfile` modules.
   *logger* must be an object compatible with :pep:`282`, usually an instance of
   :class:`logging.Logger`.

-   The *verbose* argument is currently unused.
+   The *verbose* argument is unused and deprecated.

   .. versionchanged:: 3.5
      Added support for the *xztar* format.