From 87abd9c6094f8b682f7457181adbe768d003fd23 Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Sun, 12 Jan 2014 14:27:45 -0600 Subject: [PATCH] Use calendar.timegm when calculating cookie expiration Fixes #1859 Credit: @lukasa --- requests/cookies.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/requests/cookies.py b/requests/cookies.py index 831c49c6..ea72f75e 100644 --- a/requests/cookies.py +++ b/requests/cookies.py @@ -7,6 +7,7 @@ requests.utils imports from here, so be careful with imports. """ import time +import calendar import collections from .compat import cookielib, urlparse, urlunparse, Morsel @@ -393,8 +394,8 @@ def morsel_to_cookie(morsel): expires = time.time() + 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 = calendar.timegm(time.strptime(morsel['expires'], + time_template)) return create_cookie( comment=morsel['comment'], comment_url=bool(morsel['comment']),