]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Fri, 31 Oct 2014 09:54:10 +0000 (10:54 +0100)
committerGeorg Brandl <georg@python.org>
Fri, 31 Oct 2014 09:54:10 +0000 (10:54 +0100)
1  2 
Doc/library/shutil.rst

index 6dade303f281be5aa424335a31453e5d7f8fdaba,d96fd719340a1aa07d0951daba65f21fdee69fae..82974ade226170503436583cd50d8038874ab91d
@@@ -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()