From 7094d6d61e5d04b3b716ff7538561b2bc1bb9a06 Mon Sep 17 00:00:00 2001 From: c727 Date: Thu, 31 May 2018 14:31:40 +0200 Subject: [PATCH] Change ACP code_format to None|"Number"|"Any" (#14686) --- homeassistant/components/alarm_control_panel/alarmdecoder.py | 2 +- homeassistant/components/alarm_control_panel/alarmdotcom.py | 4 ++-- homeassistant/components/alarm_control_panel/concord232.py | 2 +- homeassistant/components/alarm_control_panel/envisalink.py | 2 +- homeassistant/components/alarm_control_panel/ifttt.py | 4 ++-- homeassistant/components/alarm_control_panel/manual.py | 4 ++-- homeassistant/components/alarm_control_panel/manual_mqtt.py | 4 ++-- homeassistant/components/alarm_control_panel/mqtt.py | 4 ++-- homeassistant/components/alarm_control_panel/nx584.py | 2 +- homeassistant/components/alarm_control_panel/satel_integra.py | 2 +- homeassistant/components/alarm_control_panel/simplisafe.py | 4 ++-- homeassistant/components/alarm_control_panel/verisure.py | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/homeassistant/components/alarm_control_panel/alarmdecoder.py b/homeassistant/components/alarm_control_panel/alarmdecoder.py index 13b51aea701..626022e362a 100644 --- a/homeassistant/components/alarm_control_panel/alarmdecoder.py +++ b/homeassistant/components/alarm_control_panel/alarmdecoder.py @@ -101,7 +101,7 @@ class AlarmDecoderAlarmPanel(alarm.AlarmControlPanel): @property def code_format(self): """Return one or more digits/characters.""" - return '^\\d+$' + return 'Number' @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/alarmdotcom.py b/homeassistant/components/alarm_control_panel/alarmdotcom.py index 6b523e8b606..87e85f09da0 100644 --- a/homeassistant/components/alarm_control_panel/alarmdotcom.py +++ b/homeassistant/components/alarm_control_panel/alarmdotcom.py @@ -84,8 +84,8 @@ class AlarmDotCom(alarm.AlarmControlPanel): if self._code is None: return None elif isinstance(self._code, str) and re.search('^\\d+$', self._code): - return '^\\d+$' - return '.+' + return 'Number' + return 'Any' @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/concord232.py b/homeassistant/components/alarm_control_panel/concord232.py index bd3ee762ccb..9a65fdaff06 100644 --- a/homeassistant/components/alarm_control_panel/concord232.py +++ b/homeassistant/components/alarm_control_panel/concord232.py @@ -80,7 +80,7 @@ class Concord232Alarm(alarm.AlarmControlPanel): @property def code_format(self): """Return the characters if code is defined.""" - return '^\\d+$' + return 'Number' @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/envisalink.py b/homeassistant/components/alarm_control_panel/envisalink.py index 19bbfa611f2..25224484c79 100644 --- a/homeassistant/components/alarm_control_panel/envisalink.py +++ b/homeassistant/components/alarm_control_panel/envisalink.py @@ -106,7 +106,7 @@ class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel): """Regex for code format or None if no code is required.""" if self._code: return None - return '^\\d+$' + return 'Number' @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/ifttt.py b/homeassistant/components/alarm_control_panel/ifttt.py index 203044f3915..209c5367c92 100644 --- a/homeassistant/components/alarm_control_panel/ifttt.py +++ b/homeassistant/components/alarm_control_panel/ifttt.py @@ -129,8 +129,8 @@ class IFTTTAlarmPanel(alarm.AlarmControlPanel): if self._code is None: return None elif isinstance(self._code, str) and re.search('^\\d+$', self._code): - return '^\\d+$' - return '.+' + return 'Number' + return 'Any' def alarm_disarm(self, code=None): """Send disarm command.""" diff --git a/homeassistant/components/alarm_control_panel/manual.py b/homeassistant/components/alarm_control_panel/manual.py index e66251143da..2f2f89b9dfc 100644 --- a/homeassistant/components/alarm_control_panel/manual.py +++ b/homeassistant/components/alarm_control_panel/manual.py @@ -206,8 +206,8 @@ class ManualAlarm(alarm.AlarmControlPanel): if self._code is None: return None elif isinstance(self._code, str) and re.search('^\\d+$', self._code): - return '^\\d+$' - return '.+' + return 'Number' + return 'Any' def alarm_disarm(self, code=None): """Send disarm command.""" diff --git a/homeassistant/components/alarm_control_panel/manual_mqtt.py b/homeassistant/components/alarm_control_panel/manual_mqtt.py index c09105c91e0..895f5edd5da 100644 --- a/homeassistant/components/alarm_control_panel/manual_mqtt.py +++ b/homeassistant/components/alarm_control_panel/manual_mqtt.py @@ -242,8 +242,8 @@ class ManualMQTTAlarm(alarm.AlarmControlPanel): if self._code is None: return None elif isinstance(self._code, str) and re.search('^\\d+$', self._code): - return '^\\d+$' - return '.+' + return 'Number' + return 'Any' def alarm_disarm(self, code=None): """Send disarm command.""" diff --git a/homeassistant/components/alarm_control_panel/mqtt.py b/homeassistant/components/alarm_control_panel/mqtt.py index 0298c7384a2..8a0dfefdc70 100644 --- a/homeassistant/components/alarm_control_panel/mqtt.py +++ b/homeassistant/components/alarm_control_panel/mqtt.py @@ -122,8 +122,8 @@ class MqttAlarm(MqttAvailability, alarm.AlarmControlPanel): if self._code is None: return None elif isinstance(self._code, str) and re.search('^\\d+$', self._code): - return '^\\d+$' - return '.+' + return 'Number' + return 'Any' @asyncio.coroutine def async_alarm_disarm(self, code=None): diff --git a/homeassistant/components/alarm_control_panel/nx584.py b/homeassistant/components/alarm_control_panel/nx584.py index 67d3725fc38..ca6f1a44a6f 100644 --- a/homeassistant/components/alarm_control_panel/nx584.py +++ b/homeassistant/components/alarm_control_panel/nx584.py @@ -70,7 +70,7 @@ class NX584Alarm(alarm.AlarmControlPanel): @property def code_format(self): """Return one or more digits/characters.""" - return '^\\d+$' + return 'Number' @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/satel_integra.py b/homeassistant/components/alarm_control_panel/satel_integra.py index 964047f91e9..4ac3a93fff4 100644 --- a/homeassistant/components/alarm_control_panel/satel_integra.py +++ b/homeassistant/components/alarm_control_panel/satel_integra.py @@ -66,7 +66,7 @@ class SatelIntegraAlarmPanel(alarm.AlarmControlPanel): @property def code_format(self): """Return the regex for code format or None if no code is required.""" - return '^\\d{4,6}$' + return 'Number' @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/simplisafe.py b/homeassistant/components/alarm_control_panel/simplisafe.py index c08ac3c0ea0..b4906acba3c 100644 --- a/homeassistant/components/alarm_control_panel/simplisafe.py +++ b/homeassistant/components/alarm_control_panel/simplisafe.py @@ -88,8 +88,8 @@ class SimpliSafeAlarm(alarm.AlarmControlPanel): if self._code is None: return None elif isinstance(self._code, str) and re.search('^\\d+$', self._code): - return '^\\d+$' - return '.+' + return 'Number' + return 'Any' @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/verisure.py b/homeassistant/components/alarm_control_panel/verisure.py index 6651334400f..59bfe15fa9b 100644 --- a/homeassistant/components/alarm_control_panel/verisure.py +++ b/homeassistant/components/alarm_control_panel/verisure.py @@ -61,7 +61,7 @@ class VerisureAlarm(alarm.AlarmControlPanel): @property def code_format(self): """Return one or more digits/characters.""" - return '^\\d+$' + return 'Number' @property def changed_by(self):