From: Georg Brandl <georg@python.org>
Date: Sat, 31 Jul 2010 22:11:11 +0000 (+0000)
Subject: #5147: revert accidental indentation of header constant for MozillaCookieJar.
X-Git-Tag: v3.2a2~588
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87a1564f247eb04e559ef665bd97df0b88fca728;p=thirdparty%2FPython%2Fcpython.git

#5147: revert accidental indentation of header constant for MozillaCookieJar.
---

diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
index 57332c6d7c89..7f7f55b13694 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 6d63ae98580c..3d9a4b6ecd85 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.