From f439a366308f64927d54e03272e8294463b68880 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sun, 20 May 2012 12:02:44 +0800 Subject: [PATCH] =?UTF-8?q?=20Issue=20#14426:=20Correct=20the=20Date=20for?= =?UTF-8?q?mat=20in=20Expires=20attribute=20of=20Set-Cookie.=20Patch=20by?= =?UTF-8?q?=20Federico=20Reghenzani=20and=20M=C3=BCte=20Invert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lib/Cookie.py | 2 +- Lib/test/test_cookie.py | 8 ++++---- Misc/NEWS | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Lib/Cookie.py b/Lib/Cookie.py index 323450b38ab..616377cf736 100644 --- a/Lib/Cookie.py +++ b/Lib/Cookie.py @@ -390,7 +390,7 @@ def _getdate(future=0, weekdayname=_weekdayname, monthname=_monthname): from time import gmtime, time now = time() year, month, day, hh, mm, ss, wd, y, z = gmtime(now + future) - return "%s, %02d-%3s-%4d %02d:%02d:%02d GMT" % \ + return "%s, %02d %3s %4d %02d:%02d:%02d GMT" % \ (weekdayname[wd], day, monthname[month], year, hh, mm, ss) diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py index d09398dca1f..1fb9b7db9fe 100644 --- a/Lib/test/test_cookie.py +++ b/Lib/test/test_cookie.py @@ -64,13 +64,13 @@ class CookieTests(unittest.TestCase): # loading 'expires' C = Cookie.SimpleCookie() - C.load('Customer="W"; expires=Wed, 01-Jan-2010 00:00:00 GMT') + C.load('Customer="W"; expires=Wed, 01 Jan 2010 00:00:00 GMT') self.assertEqual(C['Customer']['expires'], - 'Wed, 01-Jan-2010 00:00:00 GMT') + 'Wed, 01 Jan 2010 00:00:00 GMT') C = Cookie.SimpleCookie() - C.load('Customer="W"; expires=Wed, 01-Jan-98 00:00:00 GMT') + C.load('Customer="W"; expires=Wed, 01 Jan 98 00:00:00 GMT') self.assertEqual(C['Customer']['expires'], - 'Wed, 01-Jan-98 00:00:00 GMT') + 'Wed, 01 Jan 98 00:00:00 GMT') def test_extended_encode(self): # Issue 9824: some browsers don't follow the standard; we now diff --git a/Misc/NEWS b/Misc/NEWS index e8ce85d8f8c..3a75453acf5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -64,6 +64,9 @@ Core and Builtins Library ------- +- Issue #14426: Correct the Date format in Expires attribute of Set-Cookie + Header in Cookie.py. + - Issue #14721: Send proper header, Content-length: 0 when the body is an empty string ''. Initial Patch contributed by Arve Knudsen.