From 1c11394f5fe38678e2c7515c00cb2892043dd780 Mon Sep 17 00:00:00 2001 From: Alok Saboo Date: Sun, 13 Jan 2019 05:59:12 -0500 Subject: [PATCH] Change alarm panel code format (#20037) * Change code format * Update elkm1 code format * Update alarmdecodes code_format * Update alarmdotcom code_format * Update concord232 code_format * Update envisalink code_format * Update ialarm code_format * Update ifttt code_format * Update manual alarm code_format * Update manual mqtt code_format * Update mqtt code_format * Update ness code_format * Update nx584 code_format * Update satel_integra code_format * Update simplisafe code_format * Update verisure code_format * Change text to be consistent with the Polymer PR --- homeassistant/components/alarm_control_panel/__init__.py | 2 ++ .../components/alarm_control_panel/alarmdecoder.py | 2 +- homeassistant/components/alarm_control_panel/alarmdotcom.py | 2 +- homeassistant/components/alarm_control_panel/concord232.py | 2 +- homeassistant/components/alarm_control_panel/elkm1.py | 2 +- homeassistant/components/alarm_control_panel/envisalink.py | 2 +- homeassistant/components/alarm_control_panel/ialarm.py | 2 +- homeassistant/components/alarm_control_panel/ifttt.py | 2 +- homeassistant/components/alarm_control_panel/manual.py | 2 +- homeassistant/components/alarm_control_panel/manual_mqtt.py | 2 +- homeassistant/components/alarm_control_panel/mqtt.py | 2 +- homeassistant/components/alarm_control_panel/ness_alarm.py | 2 +- homeassistant/components/alarm_control_panel/nx584.py | 2 +- .../components/alarm_control_panel/satel_integra.py | 2 +- homeassistant/components/alarm_control_panel/simplisafe.py | 6 +++--- homeassistant/components/alarm_control_panel/verisure.py | 2 +- 16 files changed, 19 insertions(+), 17 deletions(-) diff --git a/homeassistant/components/alarm_control_panel/__init__.py b/homeassistant/components/alarm_control_panel/__init__.py index ad8520118b4..d1e64dc56d7 100644 --- a/homeassistant/components/alarm_control_panel/__init__.py +++ b/homeassistant/components/alarm_control_panel/__init__.py @@ -21,6 +21,8 @@ from homeassistant.helpers.entity_component import EntityComponent DOMAIN = 'alarm_control_panel' SCAN_INTERVAL = timedelta(seconds=30) ATTR_CHANGED_BY = 'changed_by' +FORMAT_TEXT = 'Text' +FORMAT_NUMBER = 'Number' ENTITY_ID_FORMAT = DOMAIN + '.{}' diff --git a/homeassistant/components/alarm_control_panel/alarmdecoder.py b/homeassistant/components/alarm_control_panel/alarmdecoder.py index 25496dff0eb..16e82280433 100644 --- a/homeassistant/components/alarm_control_panel/alarmdecoder.py +++ b/homeassistant/components/alarm_control_panel/alarmdecoder.py @@ -99,7 +99,7 @@ class AlarmDecoderAlarmPanel(alarm.AlarmControlPanel): @property def code_format(self): """Return one or more digits/characters.""" - return 'Number' + return alarm.FORMAT_NUMBER @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/alarmdotcom.py b/homeassistant/components/alarm_control_panel/alarmdotcom.py index 9b07dc41690..a650e594d22 100644 --- a/homeassistant/components/alarm_control_panel/alarmdotcom.py +++ b/homeassistant/components/alarm_control_panel/alarmdotcom.py @@ -81,7 +81,7 @@ class AlarmDotCom(alarm.AlarmControlPanel): if self._code is None: return None if isinstance(self._code, str) and re.search('^\\d+$', self._code): - return 'Number' + return alarm.FORMAT_NUMBER return 'Any' @property diff --git a/homeassistant/components/alarm_control_panel/concord232.py b/homeassistant/components/alarm_control_panel/concord232.py index e3c2b4a7ec7..015b3cfce33 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 'Number' + return alarm.FORMAT_NUMBER @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/elkm1.py b/homeassistant/components/alarm_control_panel/elkm1.py index 7b8d2e4ac42..c6405f953fd 100644 --- a/homeassistant/components/alarm_control_panel/elkm1.py +++ b/homeassistant/components/alarm_control_panel/elkm1.py @@ -116,7 +116,7 @@ class ElkArea(ElkEntity, alarm.AlarmControlPanel): @property def code_format(self): """Return the alarm code format.""" - return '^[0-9]{4}([0-9]{2})?$' + return alarm.FORMAT_NUMBER @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/envisalink.py b/homeassistant/components/alarm_control_panel/envisalink.py index f0f3d2a43f7..9b772d9bdf0 100644 --- a/homeassistant/components/alarm_control_panel/envisalink.py +++ b/homeassistant/components/alarm_control_panel/envisalink.py @@ -104,7 +104,7 @@ class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel): """Regex for code format or None if no code is required.""" if self._code: return None - return 'Number' + return alarm.FORMAT_NUMBER @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/ialarm.py b/homeassistant/components/alarm_control_panel/ialarm.py index 6115edf406e..abb1862431e 100644 --- a/homeassistant/components/alarm_control_panel/ialarm.py +++ b/homeassistant/components/alarm_control_panel/ialarm.py @@ -82,7 +82,7 @@ class IAlarmPanel(alarm.AlarmControlPanel): if self._code is None: return None if isinstance(self._code, str) and re.search('^\\d+$', self._code): - return 'Number' + return alarm.FORMAT_NUMBER return 'Any' @property diff --git a/homeassistant/components/alarm_control_panel/ifttt.py b/homeassistant/components/alarm_control_panel/ifttt.py index 49c5dc488c0..f88f7b3dfab 100644 --- a/homeassistant/components/alarm_control_panel/ifttt.py +++ b/homeassistant/components/alarm_control_panel/ifttt.py @@ -129,7 +129,7 @@ class IFTTTAlarmPanel(alarm.AlarmControlPanel): if self._code is None: return None if isinstance(self._code, str) and re.search('^\\d+$', self._code): - return 'Number' + return alarm.FORMAT_NUMBER return 'Any' def alarm_disarm(self, code=None): diff --git a/homeassistant/components/alarm_control_panel/manual.py b/homeassistant/components/alarm_control_panel/manual.py index 0bbbd0689e2..1efed8ebb7b 100644 --- a/homeassistant/components/alarm_control_panel/manual.py +++ b/homeassistant/components/alarm_control_panel/manual.py @@ -207,7 +207,7 @@ class ManualAlarm(alarm.AlarmControlPanel, RestoreEntity): if self._code is None: return None if isinstance(self._code, str) and re.search('^\\d+$', self._code): - return 'Number' + return alarm.FORMAT_NUMBER return 'Any' def alarm_disarm(self, code=None): diff --git a/homeassistant/components/alarm_control_panel/manual_mqtt.py b/homeassistant/components/alarm_control_panel/manual_mqtt.py index fc59ac4d088..48b8c1053c4 100644 --- a/homeassistant/components/alarm_control_panel/manual_mqtt.py +++ b/homeassistant/components/alarm_control_panel/manual_mqtt.py @@ -241,7 +241,7 @@ class ManualMQTTAlarm(alarm.AlarmControlPanel): if self._code is None: return None if isinstance(self._code, str) and re.search('^\\d+$', self._code): - return 'Number' + return alarm.FORMAT_NUMBER return 'Any' def alarm_disarm(self, code=None): diff --git a/homeassistant/components/alarm_control_panel/mqtt.py b/homeassistant/components/alarm_control_panel/mqtt.py index 0113cfa93b1..df583fbbd94 100644 --- a/homeassistant/components/alarm_control_panel/mqtt.py +++ b/homeassistant/components/alarm_control_panel/mqtt.py @@ -172,7 +172,7 @@ class MqttAlarm(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo, if code is None: return None if isinstance(code, str) and re.search('^\\d+$', code): - return 'Number' + return alarm.FORMAT_NUMBER return 'Any' async def async_alarm_disarm(self, code=None): diff --git a/homeassistant/components/alarm_control_panel/ness_alarm.py b/homeassistant/components/alarm_control_panel/ness_alarm.py index ec52ef51e2f..ee3a0c213cb 100644 --- a/homeassistant/components/alarm_control_panel/ness_alarm.py +++ b/homeassistant/components/alarm_control_panel/ness_alarm.py @@ -59,7 +59,7 @@ class NessAlarmPanel(alarm.AlarmControlPanel): @property def code_format(self): """Return the regex for code format or None if no code is required.""" - return 'Number' + return alarm.FORMAT_NUMBER @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/nx584.py b/homeassistant/components/alarm_control_panel/nx584.py index 1b3e86c4ca6..c84872d0b25 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 'Number' + return alarm.FORMAT_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 c4e42855d8a..b704677800f 100644 --- a/homeassistant/components/alarm_control_panel/satel_integra.py +++ b/homeassistant/components/alarm_control_panel/satel_integra.py @@ -64,7 +64,7 @@ class SatelIntegraAlarmPanel(alarm.AlarmControlPanel): @property def code_format(self): """Return the regex for code format or None if no code is required.""" - return 'Number' + return alarm.FORMAT_NUMBER @property def state(self): diff --git a/homeassistant/components/alarm_control_panel/simplisafe.py b/homeassistant/components/alarm_control_panel/simplisafe.py index cdcdf07c982..cf470f15c56 100644 --- a/homeassistant/components/alarm_control_panel/simplisafe.py +++ b/homeassistant/components/alarm_control_panel/simplisafe.py @@ -7,7 +7,7 @@ https://home-assistant.io/components/alarm_control_panel.simplisafe/ import logging import re -from homeassistant.components.alarm_control_panel import AlarmControlPanel +import homeassistant.components.alarm_control_panel as alarm from homeassistant.components.simplisafe.const import ( DATA_CLIENT, DOMAIN, TOPIC_UPDATE) from homeassistant.const import ( @@ -37,7 +37,7 @@ async def async_setup_entry(hass, entry, async_add_entities): ], True) -class SimpliSafeAlarm(AlarmControlPanel): +class SimpliSafeAlarm(alarm.AlarmControlPanel): """Representation of a SimpliSafe alarm.""" def __init__(self, system, code): @@ -64,7 +64,7 @@ class SimpliSafeAlarm(AlarmControlPanel): if not self._code: return None if isinstance(self._code, str) and re.search('^\\d+$', self._code): - return 'Number' + return alarm.FORMAT_NUMBER return 'Any' @property diff --git a/homeassistant/components/alarm_control_panel/verisure.py b/homeassistant/components/alarm_control_panel/verisure.py index f5a631df390..6b381ef5a47 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 'Number' + return alarm.FORMAT_NUMBER @property def changed_by(self):