evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1154 from balloob/fix-time-utils

Browse source 
Fixed time zone conversion with no TZ specified
This commit is contained in:
Paulus Schoutsen 2016-02-06 19:10:14 -08:00
commit a417156d84
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
homeassistant/util/dt.py
View file

@ -48,7 +48,7 @@ def as_utc(dattim):
if dattim.tzinfo == UTC:
return dattim
elif dattim.tzinfo is None:
dattim = dattim.replace(tzinfo=DEFAULT_TIME_ZONE)
dattim = DEFAULT_TIME_ZONE.localize(dattim)
return dattim.astimezone(UTC)
@ -58,7 +58,7 @@ def as_local(dattim):
if dattim.tzinfo == DEFAULT_TIME_ZONE:
return dattim
elif dattim.tzinfo is None:
dattim = dattim.replace(tzinfo=UTC)
dattim = UTC.localize(dattim)
return dattim.astimezone(DEFAULT_TIME_ZONE)