summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-07-31 22:11:11 (GMT)
committerGeorg Brandl <georg@python.org>2010-07-31 22:11:11 (GMT)
commit87a1564f247eb04e559ef665bd97df0b88fca728 (patch)
treeee020ee02f75924b0d1789781e21b43ebe97d0ab
parent241bdab7357b393964d863ceabef1879511d0b1a (diff)
downloadcpython-87a1564f247eb04e559ef665bd97df0b88fca728.zip
cpython-87a1564f247eb04e559ef665bd97df0b88fca728.tar.gz
cpython-87a1564f247eb04e559ef665bd97df0b88fca728.tar.bz2
#5147: revert accidental indentation of header constant for MozillaCookieJar.
-rw-r--r--Lib/http/cookiejar.py6
-rw-r--r--Misc/NEWS3
2 files changed, 6 insertions, 3 deletions
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
index 57332c6..7f7f55b 100644
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -1974,9 +1974,9 @@ class MozillaCookieJar(FileCookieJar):
"""
magic_re = re.compile("#( Netscape)? HTTP Cookie File")
header = """\
- # Netscape HTTP Cookie File
- # http://www.netscape.com/newsref/std/cookie_spec.html
- # This is a generated file! Do not edit.
+# Netscape HTTP Cookie File
+# http://www.netscape.com/newsref/std/cookie_spec.html
+# This is a generated file! Do not edit.
"""
diff --git a/Misc/NEWS b/Misc/NEWS
index 6d63ae9..3d9a4b6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@ Core and Builtins
Library
-------
+- Issue #5147: Fix the header generated for cookie files written by
+ http.cookiejar.MozillaCookieJar.
+
- Issue #8198: In pydoc, output all help text to the correct stream
when sys.stdout is reassigned.