Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed time zone conversion with no TZ specified 

Using .replace to set the current time zone appears to not handle
things correctly. The proper way to do this is apparently .localize.
pull/1154/head
Ryan Kraus 2016-02-06 21:31:07 -05:00
parent 9fde97efed
commit 7a00bf8696
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: if dattim.tzinfo == UTC:
return dattim return dattim
elif dattim.tzinfo is None: elif dattim.tzinfo is None:
dattim = dattim.replace(tzinfo=DEFAULT_TIME_ZONE) dattim = DEFAULT_TIME_ZONE.localize(dattim)
return dattim.astimezone(UTC) return dattim.astimezone(UTC)
@ -58,7 +58,7 @@ def as_local(dattim):
if dattim.tzinfo == DEFAULT_TIME_ZONE: if dattim.tzinfo == DEFAULT_TIME_ZONE:
return dattim return dattim
elif dattim.tzinfo is None: elif dattim.tzinfo is None:
dattim = dattim.replace(tzinfo=UTC) dattim = UTC.localize(dattim)
return dattim.astimezone(DEFAULT_TIME_ZONE) return dattim.astimezone(DEFAULT_TIME_ZONE)