jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-27 15:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dont wrap '/int' parameters with tuple

Browse Source
This commit is contained in:
magnusknutas 2016-01-26 21:38:07 +01:00
parent 2c3a6e7905
commit ca070a36e3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/helpers/event.py
View File

@ -198,6 +198,8 @@ def _process_match_param(parameter):
""" Wraps parameter in a tuple if it is not one and returns it. """ """ Wraps parameter in a tuple if it is not one and returns it. """
if parameter is None or parameter == MATCH_ALL: if parameter is None or parameter == MATCH_ALL:
return MATCH_ALL return MATCH_ALL
elif isinstance(parameter, str) and parameter.startswith('/'):
return parameter
elif isinstance(parameter, str) or not hasattr(parameter, '__iter__'): elif isinstance(parameter, str) or not hasattr(parameter, '__iter__'):
return (parameter,) return (parameter,)
else: else:
@ -209,10 +211,9 @@ def _matcher(subject, pattern):
Pattern is either a tuple of allowed subjects or a `MATCH_ALL`. Pattern is either a tuple of allowed subjects or a `MATCH_ALL`.
""" """
if isinstance(pattern, tuple) \ if isinstance(pattern, str) and pattern.startswith('/'):
and isinstance(pattern[0], str) and pattern[0].startswith('/'):
try: try:
return subject % float(pattern[0].lstrip('/')) == 0 return subject % float(pattern.lstrip('/')) == 0
except ValueError: except ValueError:
return False return False