summaryrefslogtreecommitdiffstats
path: root/Doc/library/shutil.rst
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-11-07 17:11:27 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-11-07 17:11:27 (GMT)
commit1cdbf57c7cabaa0451cfcf04583f31c9a7eab38d (patch)
treef6814d674d2956144b9d044c837d50bace9f37e8 /Doc/library/shutil.rst
parentb1c6f59d7100aa34a1ea39eb828f392fa0988ea6 (diff)
parent23760e97edadb33b9b49094d55ded1ffd51a4a81 (diff)
downloadcpython-1cdbf57c7cabaa0451cfcf04583f31c9a7eab38d.zip
cpython-1cdbf57c7cabaa0451cfcf04583f31c9a7eab38d.tar.gz
cpython-1cdbf57c7cabaa0451cfcf04583f31c9a7eab38d.tar.bz2
Merge 3.2
Diffstat (limited to 'Doc/library/shutil.rst')
-rw-r--r--Doc/library/shutil.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index 6cb03b8..bb18203 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -295,7 +295,8 @@ Archiving operations
*owner* and *group* are used when creating a tar archive. By default,
uses the current owner and group.
- *logger* is an instance of :class:`logging.Logger`.
+ *logger* must be an object compatible with :pep:`282`, usually an instance of
+ :class:`logging.Logger`.
.. versionadded:: 3.2