merge requires_code and code_format properties

homeassistant/components/alarm_control_panel/__init__.py

@@ -97,14 +97,9 @@ def alarm_arm_away(hass, code, entity_id=None):
 class AlarmControlPanel(Entity):
     """ ABC for alarm control devices. """
 
-    @property
-    def requires_code(self):
-        """ Boolean if alarm requires a code """
-        return None
-
     @property
     def code_format(self):
-        """ regex for code format """
+        """ regex for code format or None if no code is required """
         return None
 
     def alarm_disarm(self, code=None):

homeassistant/components/alarm_control_panel/mqtt.py

@@ -138,19 +138,14 @@ class MqttAlarm(alarm.AlarmControlPanel):
         """ Returns the state of the device. """
         return self._state
 
-    @property
-    def requires_code(self):
-        """ code is required if it's defined in configuration file """
-        return self._code is not None
-
     @property
     def code_format(self):
-        """ One or more characters """
-        return '.+'
+        """ One or more characters if code is defined """
+        return None if self._code is None else '.+'
 
     def alarm_disarm(self, code=None):
         """ Send disarm command. """
-        if code == str(self._code) or not self.requires_code:
+        if code == str(self._code) or self.code_format is None:
             mqtt.publish(self.hass, self._command_topic,
                          self._payload_disarm, self._qos)
         else:
@@ -158,7 +153,7 @@ class MqttAlarm(alarm.AlarmControlPanel):
 
     def alarm_arm_home(self, code=None):
         """ Send arm home command. """
-        if code == str(self._code) or not self.requires_code:
+        if code == str(self._code) or self.code_format is None:
             mqtt.publish(self.hass, self._command_topic,
                          self._payload_arm_home, self._qos)
         else:
@@ -166,7 +161,7 @@ class MqttAlarm(alarm.AlarmControlPanel):
 
     def alarm_arm_away(self, code=None):
         """ Send arm away command. """
-        if code == str(self._code) or not self.requires_code:
+        if code == str(self._code) or self.code_format is None:
             mqtt.publish(self.hass, self._command_topic,
                          self._payload_arm_away, self._qos)
         else:

homeassistant/components/alarm_control_panel/verisure.py

@@ -51,14 +51,9 @@ class VerisureAlarm(alarm.AlarmControlPanel):
         """ Returns the state of the device. """
         return self._state
 
-    @property
-    def requires_code(self):
-        """ code is required """
-        return True
-
     @property
     def code_format(self):
-        """ Four digit code """
+        """ Four digit code required"""
         return '[0-9]{4}'
 
     def update(self):