Merged revisions 83393,83396,83398,83405,83408 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83393 | georg.brandl | 2010-08-01 10:35:29 +0200 (So, 01 Aug 2010) | 1 line
#1690103: fix initial namespace for code run with trace.main().
........
r83396 | georg.brandl | 2010-08-01 10:52:32 +0200 (So, 01 Aug 2010) | 1 line
#4810: document "--" option separator in timeit help.
........
r83398 | georg.brandl | 2010-08-01 11:06:34 +0200 (So, 01 Aug 2010) | 1 line
#8826: the "expires" attribute value is a date string with spaces, but apparently not all user-agents put it in quotes. Handle that as a special case.
........
r83405 | georg.brandl | 2010-08-01 16:38:17 +0200 (So, 01 Aug 2010) | 1 line
#4943: do not try to include drive letters (and colons) when looking for a probably module name.
........
r83408 | georg.brandl | 2010-08-01 17:30:56 +0200 (So, 01 Aug 2010) | 1 line
#5551: symbolic links never can be mount points. Fixes the fix for #1713.
........
diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py
index 6523b9b..0e74ccf 100644
--- a/Lib/test/test_cookie.py
+++ b/Lib/test/test_cookie.py
@@ -62,6 +62,16 @@
</script>
""")
+ # loading 'expires'
+ C = Cookie.SimpleCookie()
+ 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')
+ C = Cookie.SimpleCookie()
+ 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')
+
def test_quoted_meta(self):
# Try cookie with quoted meta-data
C = Cookie.SimpleCookie()