From b6d607075160dffea769c6ad49e4303e48722ed4 Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 3 Apr 2014 01:33:59 +0200 Subject: Update the ugly timestamp fixes for better DST detection --- src/common.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common.py b/src/common.py index 62216b5e..1ec2a42a 100644 --- a/src/common.py +++ b/src/common.py @@ -242,7 +242,7 @@ def get_utc_time(local_time=None): isdst = time.localtime().tm_isdst else: if OLD_PYTHON: - isdst = time.localtime().tm_isdst + isdst = time.localtime(int(local_time.strftime("%s"))).tm_isdst else: isdst = time.localtime(int(local_time.timestamp())).tm_isdst @@ -266,9 +266,10 @@ def get_local_time(utc_time): True """ if OLD_PYTHON: - isdst = time.localtime().tm_isdst + isdst = time.localtime(int(utc_time.strftime("%s"))).tm_isdst else: isdst = time.localtime(int(utc_time.timestamp())).tm_isdst + if time.daylight and isdst: tz = timedelta(seconds=time.altzone) else: -- cgit v1.2.3