summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2015-08-03 22:07:06 (GMT)
committerRobert Collins <rbtcollins@hp.com>2015-08-03 22:07:06 (GMT)
commitf3d9c315b68841d209b399c1c513cd9030d538fe (patch)
treebd1812f9777923bc338dd68d5a157c14499f305c /Lib
parent13b74aef6249c65e2b085a581ae9dea8c88ad8d5 (diff)
parenta0e5d981cdd4f60244ae9829e38e9bc783674e9a (diff)
downloadcpython-f3d9c315b68841d209b399c1c513cd9030d538fe.zip
cpython-f3d9c315b68841d209b399c1c513cd9030d538fe.tar.gz
cpython-f3d9c315b68841d209b399c1c513cd9030d538fe.tar.bz2
Issue #23888: Handle fractional time in cookie expiry. Patch by ssh.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/http/cookiejar.py2
-rw-r--r--Lib/test/test_http_cookiejar.py9
2 files changed, 10 insertions, 1 deletions
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
index d54f58a..b1ba72e 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):