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

Revert const replacement in fritzbox_callmonitor (#47211)

Browse source
This commit is contained in:
Tobias Sauerwein 2021-03-01 10:31:13 +01:00 • committed by GitHub
parent e1d24c69b8
commit 732db3b67c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
homeassistant/components/fritzbox_callmonitor/config_flow.py
View file

@ -7,7 +7,6 @@ import voluptuous as vol
from homeassistant import config_entries from homeassistant import config_entries
from homeassistant.const import ( from homeassistant.const import (
ATTR_NAME,
CONF_HOST, CONF_HOST,
CONF_NAME, CONF_NAME,
CONF_PASSWORD, CONF_PASSWORD,
@ -28,6 +27,7 @@ from .const import (
DEFAULT_USERNAME, DEFAULT_USERNAME,
DOMAIN, DOMAIN,
FRITZ_ACTION_GET_INFO, FRITZ_ACTION_GET_INFO,
FRITZ_ATTR_NAME,
FRITZ_ATTR_SERIAL_NUMBER, FRITZ_ATTR_SERIAL_NUMBER,
FRITZ_SERVICE_DEVICE_INFO, FRITZ_SERVICE_DEVICE_INFO,
SERIAL_NUMBER, SERIAL_NUMBER,
@ -119,7 +119,7 @@ class FritzBoxCallMonitorConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
phonebook_info = await self.hass.async_add_executor_job( phonebook_info = await self.hass.async_add_executor_job(
self._fritzbox_phonebook.fph.phonebook_info, phonebook_id self._fritzbox_phonebook.fph.phonebook_info, phonebook_id
) )
return phonebook_info[ATTR_NAME] return phonebook_info[FRITZ_ATTR_NAME]
async def _get_list_of_phonebook_names(self): async def _get_list_of_phonebook_names(self):
"""Return list of names for all available phonebooks.""" """Return list of names for all available phonebooks."""

1
homeassistant/components/fritzbox_callmonitor/const.py
View file

@ -15,6 +15,7 @@ ICON_PHONE = "mdi:phone"
ATTR_PREFIXES = "prefixes" ATTR_PREFIXES = "prefixes"
FRITZ_ACTION_GET_INFO = "GetInfo" FRITZ_ACTION_GET_INFO = "GetInfo"
FRITZ_ATTR_NAME = "name"
FRITZ_ATTR_SERIAL_NUMBER = "NewSerialNumber" FRITZ_ATTR_SERIAL_NUMBER = "NewSerialNumber"
FRITZ_SERVICE_DEVICE_INFO = "DeviceInfo" FRITZ_SERVICE_DEVICE_INFO = "DeviceInfo"

6
tests/components/fritzbox_callmonitor/test_config_flow.py
View file

@ -14,12 +14,12 @@ from homeassistant.components.fritzbox_callmonitor.const import (
CONF_PHONEBOOK, CONF_PHONEBOOK,
CONF_PREFIXES, CONF_PREFIXES,
DOMAIN, DOMAIN,
FRITZ_ATTR_NAME,
FRITZ_ATTR_SERIAL_NUMBER, FRITZ_ATTR_SERIAL_NUMBER,
SERIAL_NUMBER, SERIAL_NUMBER,
) )
from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
from homeassistant.const import ( from homeassistant.const import (
ATTR_NAME,
CONF_HOST, CONF_HOST,
CONF_NAME, CONF_NAME,
CONF_PASSWORD, CONF_PASSWORD,
@ -69,8 +69,8 @@ MOCK_YAML_CONFIG = {
CONF_NAME: MOCK_NAME, CONF_NAME: MOCK_NAME,
} }
MOCK_DEVICE_INFO = {FRITZ_ATTR_SERIAL_NUMBER: MOCK_SERIAL_NUMBER} MOCK_DEVICE_INFO = {FRITZ_ATTR_SERIAL_NUMBER: MOCK_SERIAL_NUMBER}
MOCK_PHONEBOOK_INFO_1 = {ATTR_NAME: MOCK_PHONEBOOK_NAME_1} MOCK_PHONEBOOK_INFO_1 = {FRITZ_ATTR_NAME: MOCK_PHONEBOOK_NAME_1}
MOCK_PHONEBOOK_INFO_2 = {ATTR_NAME: MOCK_PHONEBOOK_NAME_2} MOCK_PHONEBOOK_INFO_2 = {FRITZ_ATTR_NAME: MOCK_PHONEBOOK_NAME_2}
MOCK_UNIQUE_ID = f"{MOCK_SERIAL_NUMBER}-{MOCK_PHONEBOOK_ID}" MOCK_UNIQUE_ID = f"{MOCK_SERIAL_NUMBER}-{MOCK_PHONEBOOK_ID}"