summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author张酉夫 <zhangyoufu@gmail.com>2019-12-19 12:28:58 +0800
committerMarcel Hellkamp <marc@gsites.de>2019-12-19 13:22:28 +0100
commit73ffccef399d3b1b1bb26509f17eed25273a4679 (patch)
treef1f4951e94a02c8cc7f6cebbf40383bf98f5ec65
parent9f81b8087ba1486a475c27208a3fd678a526f6fc (diff)
downloadbottle-73ffccef399d3b1b1bb26509f17eed25273a4679.tar.gz
refine parse_date
-rwxr-xr-xbottle.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bottle.py b/bottle.py
index 56a1b77..a590c4c 100755
--- a/bottle.py
+++ b/bottle.py
@@ -2980,7 +2980,7 @@ def parse_date(ims):
""" Parse rfc1123, rfc850 and asctime timestamps and return UTC epoch. """
try:
ts = email.utils.parsedate_tz(ims)
- return time.mktime(ts[:8] + (0, )) - (ts[9] or 0) - time.timezone
+ return calendar.timegm(ts[:8] + (0, )) - (ts[9] or 0)
except (TypeError, ValueError, IndexError, OverflowError):
return None