diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 18:52:52 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 18:52:52 +0000 |
| commit | 78e6957cdf091318e4b31d17008fbaa08fffa6a2 (patch) | |
| tree | 2d9cd5050eb839a894e4a196c46ac25a33667887 /Lib/Cookie.py | |
| parent | 47befa5f83a8b40692b305e3fd6b5131324f9741 (diff) | |
| download | cpython-git-78e6957cdf091318e4b31d17008fbaa08fffa6a2.tar.gz | |
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.
........
Diffstat (limited to 'Lib/Cookie.py')
| -rw-r--r-- | Lib/Cookie.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/Cookie.py b/Lib/Cookie.py index fc6d9f61b6..b4f9db4e82 100644 --- a/Lib/Cookie.py +++ b/Lib/Cookie.py @@ -534,6 +534,8 @@ _CookiePattern = re.compile( r"(?P<val>" # Start of group 'val' r'"(?:[^\\"]|\\.)*"' # Any doublequoted string r"|" # or + r"\w{3},\s[\w\d-]{9,11}\s[\d:]{8}\sGMT" # Special case for "expires" attr + r"|" # or ""+ _LegalCharsPatt +"*" # Any word or empty string r")" # End of group 'val' r"\s*;?" # Probably ending in a semi-colon |