mirror of
https://github.com/Electric-Special/ha-core.git
synced 2026-03-21 03:03:17 +01:00
Ensure DOMAIN constant is always aliased with _DOMAIN suffix (#163270)
This commit is contained in:
@@ -24,7 +24,7 @@ from pycec.tcp import TcpAdapter
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.media_player import DOMAIN as MEDIA_PLAYER_DOMAIN
|
||||
from homeassistant.components.switch import DOMAIN as SWITCH
|
||||
from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
|
||||
from homeassistant.const import (
|
||||
CONF_DEVICES,
|
||||
CONF_HOST,
|
||||
@@ -122,11 +122,13 @@ CONFIG_SCHEMA = vol.Schema(
|
||||
vol.Optional(CONF_DEVICES): vol.Any(
|
||||
DEVICE_SCHEMA, vol.Schema({vol.All(cv.string): vol.Any(cv.string)})
|
||||
),
|
||||
vol.Optional(CONF_PLATFORM): vol.Any(SWITCH, MEDIA_PLAYER_DOMAIN),
|
||||
vol.Optional(CONF_PLATFORM): vol.Any(
|
||||
SWITCH_DOMAIN, MEDIA_PLAYER_DOMAIN
|
||||
),
|
||||
vol.Optional(CONF_HOST): cv.string,
|
||||
vol.Optional(CONF_DISPLAY_NAME): cv.string,
|
||||
vol.Optional(CONF_TYPES, default={}): vol.Schema(
|
||||
{cv.entity_id: vol.Any(MEDIA_PLAYER_DOMAIN, SWITCH)}
|
||||
{cv.entity_id: vol.Any(MEDIA_PLAYER_DOMAIN, SWITCH_DOMAIN)}
|
||||
),
|
||||
}
|
||||
)
|
||||
@@ -170,7 +172,7 @@ def setup(hass: HomeAssistant, base_config: ConfigType) -> bool: # noqa: C901
|
||||
device_aliases.update(parse_mapping(devices))
|
||||
_LOGGER.debug("Parsed devices: %s", device_aliases)
|
||||
|
||||
platform = base_config[DOMAIN].get(CONF_PLATFORM, SWITCH)
|
||||
platform = base_config[DOMAIN].get(CONF_PLATFORM, SWITCH_DOMAIN)
|
||||
|
||||
loop = (
|
||||
# Create own thread if more than 1 CPU
|
||||
|
||||
@@ -296,7 +296,7 @@ class HassImportsFormatChecker(BaseChecker):
|
||||
|
||||
# Check for `from homeassistant.components.other import DOMAIN`
|
||||
for name, alias in node.names:
|
||||
if name == "DOMAIN" and (alias is None or alias == "DOMAIN"):
|
||||
if name == "DOMAIN" and (alias is None or not alias.endswith("_DOMAIN")):
|
||||
self.add_message(
|
||||
"hass-import-constant-alias",
|
||||
node=node,
|
||||
|
||||
Reference in New Issue
Block a user