[Python-checkins] cpython (merge 3.2 -> default): #15980: merge with 3.2.

Fri Sep 21 15:31:50 CEST 2012

http://hg.python.org/cpython/rev/1830426da082
changeset: 79085:1830426da082
parent: 79082:637634679bcd
parent: 79084:e582ad1aee62
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Sep 21 16:31:24 2012 +0300
summary:
 #15980: merge with 3.2.
files:
 Lib/http/cookiejar.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -1825,7 +1825,7 @@
 
 class LWPCookieJar(FileCookieJar):
 """
- The LWPCookieJar saves a sequence of"Set-Cookie3" lines.
+ The LWPCookieJar saves a sequence of "Set-Cookie3" lines.
 "Set-Cookie3" is the format used by the libwww-perl libary, not known
 to be compatible with any browser, but which is easy to read and
 doesn't lose information about RFC 2965 cookies.
@@ -1837,7 +1837,7 @@
 """
 
 def as_lwp_str(self, ignore_discard=True, ignore_expires=True):
- """Return cookies as a string of "\n"-separated "Set-Cookie3" headers.
+ """Return cookies as a string of "\\n"-separated "Set-Cookie3" headers.
 
 ignore_discard and ignore_expires: see docstring for FileCookieJar.save
 
-- 
Repository URL: http://hg.python.org/cpython
