Skip to content

Fix time functions would throw errors in python scripts #11414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pvizeli merged 4 commits into from
Jan 7, 2018
Merged

Fix time functions would throw errors in python scripts #11414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aba2a59
Fix time functions would throw errors in python scripts
tomwaters Jan 1, 2018
7875934
Added unit test for time.strptime, change variable name to satisfy lint
tomwaters Jan 6, 2018
74e99ec
Added docstring for time attribute wrapper method to satisfy lint
tomwaters Jan 6, 2018
2dac5c8
Fixed line too long lint problem
tomwaters Jan 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion homeassistant/components/python_script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,4 +202,11 @@ def sleep(self, *args, **kwargs):

def __getattr__(self, attr):
"""Fetch an attribute from Time module."""
return getattr(time, attr)
attribute = getattr(time, attr)
if callable(attribute):
def wrapper(*args, **kw):
"""Wrapper to return callable method if callable."""
return attribute(*args, **kw)
return wrapper
else:
return attribute
3 changes: 3 additions & 0 deletions tests/components/test_python_script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,8 @@ def test_exposed_modules(hass, caplog):
caplog.set_level(logging.ERROR)
source = """
hass.states.set('module.time', time.strftime('%Y', time.gmtime(521276400)))
hass.states.set('module.time_strptime',
time.strftime('%H:%M', time.strptime('12:34', '%H:%M')))
hass.states.set('module.datetime',
datetime.timedelta(minutes=1).total_seconds())
"""
Expand All @@ -244,6 +246,7 @@ def test_exposed_modules(hass, caplog):
yield from hass.async_block_till_done()

assert hass.states.is_state('module.time', '1986')
assert hass.states.is_state('module.time_strptime', '12:34')
assert hass.states.is_state('module.datetime', '60.0')

# No errors logged = good
Expand Down