From: Senthil Kumaran Date: Sun, 20 May 2012 04:05:16 +0000 (+0800) Subject: Issue #14426: Correct the Date format in Expires attribute of Set-Cookie. Patch... X-Git-Tag: v3.3.0a4~117^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00c2ec282e1653a67bb99c5f96eb2cbf64b19ab5;p=thirdparty%2FPython%2Fcpython.git Issue #14426: Correct the Date format in Expires attribute of Set-Cookie. Patch by Federico Reghenzani and Müte Invert --- diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py index 93da62791df4..2aeb8d320fb9 100644 --- a/Lib/http/cookies.py +++ b/Lib/http/cookies.py @@ -301,7 +301,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_http_cookies.py b/Lib/test/test_http_cookies.py index f9a98c4ae142..1f1ca5852ef0 100644 --- a/Lib/test/test_http_cookies.py +++ b/Lib/test/test_http_cookies.py @@ -86,13 +86,13 @@ class CookieTests(unittest.TestCase): # loading 'expires' C = cookies.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 = cookies.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') # 'max-age' C = cookies.SimpleCookie('Customer="WILE_E_COYOTE"')