diff options
author | Robert Collins <rbtcollins@hp.com> | 2015-08-03 22:06:29 (GMT) |
---|---|---|
committer | Robert Collins <rbtcollins@hp.com> | 2015-08-03 22:06:29 (GMT) |
commit | a0e5d981cdd4f60244ae9829e38e9bc783674e9a (patch) | |
tree | 248edf1f99f6d7212bd70cc08dae36e59c7d78a9 | |
parent | 43cbbe21a7c0683b45334d9c979d612525cd1435 (diff) | |
download | cpython-a0e5d981cdd4f60244ae9829e38e9bc783674e9a.zip cpython-a0e5d981cdd4f60244ae9829e38e9bc783674e9a.tar.gz cpython-a0e5d981cdd4f60244ae9829e38e9bc783674e9a.tar.bz2 |
Issue #23888: Handle fractional time in cookie expiry. Patch by ssh.
-rw-r--r-- | Lib/http/cookiejar.py | 2 | ||||
-rw-r--r-- | Lib/test/test_http_cookiejar.py | 9 | ||||
-rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py index bfc6ae9..92ead53 100644 --- a/Lib/http/cookiejar.py +++ b/Lib/http/cookiejar.py @@ -758,7 +758,7 @@ class Cookie: ): if version is not None: version = int(version) - if expires is not None: expires = int(expires) + if expires is not None: expires = int(float(expires)) if port is None and port_specified is True: raise ValueError("if port is None, port_specified must be false") diff --git a/Lib/test/test_http_cookiejar.py b/Lib/test/test_http_cookiejar.py index e9f0356..50260ff 100644 --- a/Lib/test/test_http_cookiejar.py +++ b/Lib/test/test_http_cookiejar.py @@ -566,6 +566,15 @@ class CookieTests(unittest.TestCase): self.assertEqual(len(c), 1) self.assertIn('spam="bar"', h) + # test if fractional expiry is accepted + cookie = Cookie(0, "name", "value", + None, False, "www.python.org", + True, False, "/", + False, False, "1444312383.018307", + False, None, None, + {}) + self.assertEqual(cookie.expires, 1444312383) + # XXX RFC 2965 expiry rules (some apply to V0 too) def test_default_path(self): @@ -66,6 +66,8 @@ Core and Builtins Library ------- +- Issue #23888: Handle fractional time in cookie expiry. Patch by ssh. + - Issue #23652: Make it possible to compile the select module against the libc headers from the Linux Standard Base, which do not include some EPOLL macros. Patch by Matt Frank. |