evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some unnecessary uses of regular expressions (#101182)

Browse source
This commit is contained in:
Ville Skyttä 2023-10-04 04:55:00 +03:00 • committed by GitHub
parent 09ba34fb3a
commit 5551a345ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
homeassistant/components/ifttt/alarm_control_panel.py
View file

@ -2,7 +2,6 @@
from __future__ import annotations from __future__ import annotations
import logging import logging
import re
import voluptuous as vol import voluptuous as vol
@ -160,7 +159,7 @@ class IFTTTAlarmPanel(AlarmControlPanelEntity):
"""Return one or more digits/characters.""" """Return one or more digits/characters."""
if self._code is None: if self._code is None:
return None return None
if isinstance(self._code, str) and re.search("^\\d+$", self._code): if isinstance(self._code, str) and self._code.isdigit():
return CodeFormat.NUMBER return CodeFormat.NUMBER
return CodeFormat.TEXT return CodeFormat.TEXT

3
homeassistant/components/manual/alarm_control_panel.py
View file

@ -3,7 +3,6 @@ from __future__ import annotations
import datetime import datetime
import logging import logging
import re
from typing import Any from typing import Any
import voluptuous as vol import voluptuous as vol
@ -280,7 +279,7 @@ class ManualAlarm(alarm.AlarmControlPanelEntity, RestoreEntity):
"""Return one or more digits/characters.""" """Return one or more digits/characters."""
if self._code is None: if self._code is None:
return None return None
if isinstance(self._code, str) and re.search("^\\d+$", self._code): if isinstance(self._code, str) and self._code.isdigit():
return alarm.CodeFormat.NUMBER return alarm.CodeFormat.NUMBER
return alarm.CodeFormat.TEXT return alarm.CodeFormat.TEXT

3
homeassistant/components/manual_mqtt/alarm_control_panel.py
View file

@ -3,7 +3,6 @@ from __future__ import annotations
import datetime import datetime
import logging import logging
import re
from typing import Any from typing import Any
import voluptuous as vol import voluptuous as vol
@ -347,7 +346,7 @@ class ManualMQTTAlarm(alarm.AlarmControlPanelEntity):
"""Return one or more digits/characters.""" """Return one or more digits/characters."""
if self._code is None: if self._code is None:
return None return None
if isinstance(self._code, str) and re.search("^\\d+$", self._code): if isinstance(self._code, str) and self._code.isdigit():
return alarm.CodeFormat.NUMBER return alarm.CodeFormat.NUMBER
return alarm.CodeFormat.TEXT return alarm.CodeFormat.TEXT

5
homeassistant/components/mqtt/alarm_control_panel.py
View file

@ -3,7 +3,6 @@ from __future__ import annotations
import functools import functools
import logging import logging
import re
import voluptuous as vol import voluptuous as vol
@ -178,9 +177,7 @@ class MqttAlarm(MqttEntity, alarm.AlarmControlPanelEntity):
if (code := self._config.get(CONF_CODE)) is None: if (code := self._config.get(CONF_CODE)) is None:
self._attr_code_format = None self._attr_code_format = None
elif code == REMOTE_CODE or ( elif code == REMOTE_CODE or (isinstance(code, str) and code.isdigit()):
isinstance(code, str) and re.search("^\\d+$", code)
):
self._attr_code_format = alarm.CodeFormat.NUMBER self._attr_code_format = alarm.CodeFormat.NUMBER
else: else:
self._attr_code_format = alarm.CodeFormat.TEXT self._attr_code_format = alarm.CodeFormat.TEXT

5
homeassistant/helpers/config_validation.py
View file

@ -203,12 +203,9 @@ def boolean(value: Any) -> bool:
raise vol.Invalid(f"invalid boolean value {value}") raise vol.Invalid(f"invalid boolean value {value}")
_WS = re.compile("\\s*")
def whitespace(value: Any) -> str: def whitespace(value: Any) -> str:
"""Validate result contains only whitespace.""" """Validate result contains only whitespace."""
if isinstance(value, str) and _WS.fullmatch(value): if isinstance(value, str) and (value == "" or value.isspace()):
return value return value
raise vol.Invalid(f"contains non-whitespace: {value}") raise vol.Invalid(f"contains non-whitespace: {value}")

3
script/lint_and_test.py
View file

@ -173,8 +173,7 @@ async def main():
) )
return return
pyfile = re.compile(r".+\.py$") pyfiles = [file for file in files if file.endswith(".py")]
pyfiles = [file for file in files if pyfile.match(file)]
print("=============================") print("=============================")
printc("bold", "CHANGED FILES:\n", "\n ".join(pyfiles)) printc("bold", "CHANGED FILES:\n", "\n ".join(pyfiles))