From: Georg Brandl <georg@python.org>
Date: Fri, 31 Oct 2014 09:54:10 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~554
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=455de40a6e99ad7548e6061733f9c5dae2327e83;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

455de40a6e99ad7548e6061733f9c5dae2327e83
diff --cc Doc/library/shutil.rst
index 6dade303f281,d96fd719340a..82974ade2261
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@@ -491,11 -458,8 +491,11 @@@ provided.  They rely on the :mod:`zipfi
     *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.
 +
  
  .. function:: get_archive_formats()