sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

Fix russia timezone detection (#637)

Browse Source 
Fixes https://github.com/esphome/issues/issues/378#issuecomment-500219634
This commit is contained in:
Otto Winter
2019-06-14 12:35:14 +02:00
parent 88c129e705
commit 4a55692885
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
esphome/components/time/__init__.py
View File

@@ -52,6 +52,15 @@ def _tz_dst_str(dt):
_tz_timedelta(td)) _tz_timedelta(td))
def _non_dst_tz(tz, dt):
tzname = tz.tzname(dt)
utcoffset = tz.utcoffset(dt)
_LOGGER.info("Detected timezone '%s' with UTC offset %s",
tzname, _tz_timedelta(utcoffset))
tzbase = '{}{}'.format(tzname, _tz_timedelta(-1 * utcoffset))
return tzbase
def convert_tz(pytz_obj): def convert_tz(pytz_obj):
tz = pytz_obj tz = pytz_obj
@@ -59,24 +68,14 @@ def convert_tz(pytz_obj):
first_january = datetime.datetime(year=now.year, month=1, day=1) first_january = datetime.datetime(year=now.year, month=1, day=1)
if not isinstance(tz, pytz.tzinfo.DstTzInfo): if not isinstance(tz, pytz.tzinfo.DstTzInfo):
tzname = tz.tzname(first_january) return _non_dst_tz(tz, first_january)
utcoffset = tz.utcoffset(first_january)
_LOGGER.info("Detected timezone '%s' with UTC offset %s",
tzname, _tz_timedelta(utcoffset))
tzbase = '{}{}'.format(tzname, _tz_timedelta(-1 * utcoffset))
return tzbase
# pylint: disable=protected-access # pylint: disable=protected-access
transition_times = tz._utc_transition_times transition_times = tz._utc_transition_times
transition_info = tz._transition_info transition_info = tz._transition_info
idx = max(0, bisect.bisect_right(transition_times, now)) idx = max(0, bisect.bisect_right(transition_times, now))
if idx >= len(transition_times): if idx >= len(transition_times):
tzname = tz.tzname(now) return _non_dst_tz(tz, now)
utcoffset = tz.utcoffset(now)
_LOGGER.info("Detected timezone '%s' with UTC offset %s",
tzname, _tz_timedelta(utcoffset))
tzbase = '{}{}'.format(tzname, _tz_timedelta(-1 * utcoffset))
return tzbase
idx1, idx2 = idx, idx + 1 idx1, idx2 = idx, idx + 1
dstoffset1 = transition_info[idx1][1] dstoffset1 = transition_info[idx1][1]
@@ -84,6 +83,14 @@ def convert_tz(pytz_obj):
# Normalize to 1 being DST on # Normalize to 1 being DST on
idx1, idx2 = idx + 1, idx + 2 idx1, idx2 = idx + 1, idx + 2
if idx2 >= len(transition_times):
return _non_dst_tz(tz, now)
if transition_times[idx2].year > now.year + 1:
# Next transition is scheduled after this year
# Probably a scheduler timezone change.
return _non_dst_tz(tz, now)
utcoffset_on, _, tzname_on = transition_info[idx1] utcoffset_on, _, tzname_on = transition_info[idx1]
utcoffset_off, _, tzname_off = transition_info[idx2] utcoffset_off, _, tzname_off = transition_info[idx2]
dst_begins_utc = transition_times[idx1] dst_begins_utc = transition_times[idx1]