diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-11-07 18:11:27 +0100 |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-11-07 18:11:27 +0100 |
| commit | 1cdbf57c7cabaa0451cfcf04583f31c9a7eab38d (patch) | |
| tree | f6814d674d2956144b9d044c837d50bace9f37e8 | |
| parent | b1c6f59d7100aa34a1ea39eb828f392fa0988ea6 (diff) | |
| parent | 23760e97edadb33b9b49094d55ded1ffd51a4a81 (diff) | |
| download | cpython-git-1cdbf57c7cabaa0451cfcf04583f31c9a7eab38d.tar.gz | |
Merge 3.2
| -rw-r--r-- | Doc/library/shutil.rst | 3 | ||||
| -rw-r--r-- | Lib/http/cookiejar.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index 6cb03b8664..bb18203e2d 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 diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py index 97383d603e..a516d735b8 100644 --- a/Lib/http/cookiejar.py +++ b/Lib/http/cookiejar.py @@ -1,4 +1,4 @@ -"""HTTP cookie handling for web clients. +r"""HTTP cookie handling for web clients. This module has (now fairly distant) origins in Gisle Aas' Perl module HTTP::Cookies, from the libwww-perl library. |