diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2015-10-14 19:04:18 +0200 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2015-10-14 19:04:18 +0200 |
| commit | cb40ec082506c0d9eb05978839bed2f12541af35 (patch) | |
| tree | 0fe8938e38767200c05ba3e8071bfe6777f75a3e /requests/cookies.py | |
| parent | b4a5af4fcbf4e5d0f741aaf9978c728235b11a56 (diff) | |
| download | python-requests-cb40ec082506c0d9eb05978839bed2f12541af35.tar python-requests-cb40ec082506c0d9eb05978839bed2f12541af35.tar.gz | |
Import requests_2.8.1.orig.tar.gz
Diffstat (limited to 'requests/cookies.py')
| -rw-r--r-- | requests/cookies.py | 9 |
1 files changed, 6 insertions, 3 deletions
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']), |