jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated SMA config (#26306)

Browse Source
This commit is contained in:
Paulus Schoutsen 2019-08-30 16:41:07 -07:00 committed by GitHub
parent 299695ca24
commit 2f6bdc8643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
homeassistant/components/sma/sensor.py
View File

@ -19,7 +19,6 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.event import async_track_time_interval
from homeassistant.const import MINOR_VERSION, MAJOR_VERSION
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -31,7 +30,6 @@ CONF_SENSORS = "sensors"
CONF_UNIT = "unit" CONF_UNIT = "unit"
GROUPS = ["user", "installer"] GROUPS = ["user", "installer"]
OLD_CONFIG_DEPRECATED = MAJOR_VERSION > 0 or MINOR_VERSION > 98
def _check_sensor_schema(conf): def _check_sensor_schema(conf):
@ -45,29 +43,6 @@ def _check_sensor_schema(conf):
customs = list(conf[CONF_CUSTOM].keys()) customs = list(conf[CONF_CUSTOM].keys())
if isinstance(conf[CONF_SENSORS], dict):
msg = '"sensors" should be a simple list from 0.99'
if OLD_CONFIG_DEPRECATED:
raise vol.Invalid(msg)
_LOGGER.warning(msg)
valid.extend(customs)
for sname, attrs in conf[CONF_SENSORS].items():
if sname not in valid:
raise vol.Invalid("{} does not exist".format(sname))
if attrs:
_LOGGER.warning(
"Attributes on sensors will be deprecated in 0.99. Start using only individual sensors: %s: %s",
sname,
", ".join(attrs),
)
for attr in attrs:
if attr in valid:
continue
raise vol.Invalid("{} does not exist [{}]".format(attr, sname))
return conf
# Sensors is a list (only option from from 0.99)
for sensor in conf[CONF_SENSORS]: for sensor in conf[CONF_SENSORS]:
if sensor in customs: if sensor in customs:
_LOGGER.warning( _LOGGER.warning(

18
tests/components/sma/test_sensor.py
View File

@ -15,24 +15,6 @@ BASE_CFG = {
} }
async def test_sma_config_old(hass):
"""Test old config."""
sensors = {"current_consumption": ["current_consumption"]}
with assert_setup_component(1):
assert await async_setup_component(
hass, DOMAIN, {DOMAIN: dict(BASE_CFG, sensors=sensors)}
)
state = hass.states.get("sensor.current_consumption")
assert state
assert "unit_of_measurement" in state.attributes
assert "current_consumption" in state.attributes
state = hass.states.get("sensor.my_sensor")
assert not state
async def test_sma_config(hass): async def test_sma_config(hass):
"""Test new config.""" """Test new config."""
sensors = ["current_consumption"] sensors = ["current_consumption"]