From ca070a36e30198e00c10073ac6644ae9144f9395 Mon Sep 17 00:00:00 2001 From: magnusknutas Date: Tue, 26 Jan 2016 21:38:07 +0100 Subject: [PATCH] Dont wrap '/int' parameters with tuple --- homeassistant/helpers/event.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/homeassistant/helpers/event.py b/homeassistant/helpers/event.py index 6ca186a1744..0f0deac58b1 100644 --- a/homeassistant/helpers/event.py +++ b/homeassistant/helpers/event.py @@ -198,6 +198,8 @@ def _process_match_param(parameter): """ Wraps parameter in a tuple if it is not one and returns it. """ if parameter is None or parameter == MATCH_ALL: return MATCH_ALL + elif isinstance(parameter, str) and parameter.startswith('/'): + return parameter elif isinstance(parameter, str) or not hasattr(parameter, '__iter__'): return (parameter,) else: @@ -209,10 +211,9 @@ def _matcher(subject, pattern): Pattern is either a tuple of allowed subjects or a `MATCH_ALL`. """ - if isinstance(pattern, tuple) \ - and isinstance(pattern[0], str) and pattern[0].startswith('/'): + if isinstance(pattern, str) and pattern.startswith('/'): try: - return subject % float(pattern[0].lstrip('/')) == 0 + return subject % float(pattern.lstrip('/')) == 0 except ValueError: return False