From cb40ec082506c0d9eb05978839bed2f12541af35 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Wed, 14 Oct 2015 19:04:18 +0200 Subject: Import requests_2.8.1.orig.tar.gz --- requests/cookies.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'requests/cookies.py') diff --git a/requests/cookies.py b/requests/cookies.py index 1fbc934..88b478c 100644 --- a/requests/cookies.py +++ b/requests/cookies.py @@ -415,11 +415,14 @@ def morsel_to_cookie(morsel): expires = None if morsel['max-age']: - expires = time.time() + morsel['max-age'] + try: + expires = int(time.time() + int(morsel['max-age'])) + except ValueError: + raise TypeError('max-age: %s must be integer' % morsel['max-age']) elif morsel['expires']: time_template = '%a, %d-%b-%Y %H:%M:%S GMT' - expires = time.mktime( - time.strptime(morsel['expires'], time_template)) - time.timezone + expires = int(time.mktime( + time.strptime(morsel['expires'], time_template)) - time.timezone) return create_cookie( comment=morsel['comment'], comment_url=bool(morsel['comment']), -- cgit v1.2.3