summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-05-20 04:06:51 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-05-20 04:06:51 (GMT)
commit0b943a18ef3c175836fde6403782c982ef2ff776 (patch)
treeae9b43b006647d2da9771b94477f89011645038f
parentb20df9582778119a2ae3d031da8b597c19ad4fc9 (diff)
parent00c2ec282e1653a67bb99c5f96eb2cbf64b19ab5 (diff)
downloadcpython-0b943a18ef3c175836fde6403782c982ef2ff776.zip
cpython-0b943a18ef3c175836fde6403782c982ef2ff776.tar.gz
cpython-0b943a18ef3c175836fde6403782c982ef2ff776.tar.bz2
Issue #14426: Correct the Date format in Expires attribute of Set-Cookie. Patch by Federico Reghenzani and Müte Invert
-rw-r--r--Lib/http/cookies.py2
-rw-r--r--Lib/test/test_http_cookies.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py
index d73f79a..34d2f58 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 a56a42d..e8327e5 100644
--- a/Lib/test/test_http_cookies.py
+++ b/Lib/test/test_http_cookies.py
@@ -95,13 +95,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"')