Use calendar.timegm when calculating cookie expiration

Fixes #1859

Credit: @lukasa
This commit is contained in:
Ian Cordasco
2014-01-12 14:27:45 -06:00
parent ac4e05874a
commit 87abd9c609
+3 -2
View File
@@ -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']),