Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-20 16:18:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix timezone detection (#586)

Browse Source 
* Fix timezone detection

* Update __init__.py
This commit is contained in:
Otto Winter 2019-06-01 12:03:43 +02:00
parent e5899ff717
commit 075fcb77a8
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,14 @@ def convert_tz(pytz_obj):
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):
tzname = tz.tzname(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]
if dstoffset1 == datetime.timedelta(seconds=0): if dstoffset1 == datetime.timedelta(seconds=0):
@ -244,10 +252,12 @@ def validate_tz(value):
value = cv.string_strict(value) value = cv.string_strict(value)
try: try:
return convert_tz(pytz.timezone(value)) pytz_obj = pytz.timezone(value)
except Exception: # pylint: disable=broad-except except pytz.UnknownTimeZoneError: # pylint: disable=broad-except
return value return value
return convert_tz(pytz_obj)
TIME_SCHEMA = cv.Schema({ TIME_SCHEMA = cv.Schema({
cv.Optional(CONF_TIMEZONE, default=detect_tz): validate_tz, cv.Optional(CONF_TIMEZONE, default=detect_tz): validate_tz,