From 06c42a3fcab04420dc2c089bd7712bca99cf6be6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Mon, 7 Nov 2011 17:31:07 +0100
Subject: [PATCH 1/2] Document that shutil.make_archive does not typecheck its
 logger argument

---
 Doc/library/shutil.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index a785682c0f0..8b4aabbb717 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -269,7 +269,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
 

From 23760e97edadb33b9b49094d55ded1ffd51a4a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Mon, 7 Nov 2011 17:52:48 +0100
Subject: [PATCH 2/2] =?UTF-8?q?Don=E2=80=99t=20interpret=20backslashes=20i?=
 =?UTF-8?q?n=20ASCII=20diagram=20in=20a=20docstring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Lib/http/cookiejar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
index 97383d603e6..a516d735b8a 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.