8000 renamed add_devices to async_add_devices according to hass naming scheme by Julius2342 · Pull Request #9485 · home-assistant/core · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

renamed add_devices to async_add_devices according to hass naming scheme #9485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 19, 2017
Merged

renamed add_devices to async_add_devices according to hass naming scheme #9485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
722bc19
renamed add_devices to async_add_devices according to hass naming scheme
Julius2342 Sep 18, 2017
c8da8d8
replaced some occurencies of async_add_entites to async_add_devices
Julius2342 Sep 18, 2017
6156394
fixed unit test
Julius2342 Sep 19, 2017
718ee79
fixed unit test
Julius2342 Sep 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions homeassistant/components/alarm_control_panel/spc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@ def _get_alarm_state(spc_mode):


@asyncio.coroutine
def async_setup_platform(hass, config, async_add_entities,
def async_setup_platform(hass, config, async_add_devices,
discovery_info=None):
"""Set up the SPC alarm control panel platform."""
if (discovery_info is None or
discovery_info[ATTR_DISCOVER_AREAS] is None):
return

entities = [SpcAlarm(hass=hass,
area_id=area['id'],
name=area['name'],
state=_get_alarm_state(area['mode']))
for area in discovery_info[ATTR_DISCOVER_AREAS]]
devices = [SpcAlarm(hass=hass,
area_id=area['id'],
name=area['name'],
state=_get_alarm_state(area['mode']))
for area in discovery_info[ATTR_DISCOVER_AREAS]]

async_add_entities(entities)
async_add_devices(devices)


class SpcAlarm(alarm.AlarmControlPanel):
Expand Down
14 changes: 7 additions & 7 deletions homeassistant/components/binary_sensor/knx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,33 +53,33 @@


@asyncio.coroutine
def async_setup_platform(hass, config, add_devices,
def async_setup_platform(hass, config, async_add_devices,
discovery_info=None):
"""Set up binary sensor(s) for KNX platform."""
if DATA_KNX not in hass.data \
or not hass.data[DATA_KNX].initialized:
return False

if discovery_info is not None:
async_add_devices_discovery(hass, discovery_info, add_devices)
async_add_devices_discovery(hass, discovery_info, async_add_devices)
else:
async_add_devices_config(hass, config, add_devices)
async_add_devices_config(hass, config, async_add_devices)

return True


@callback
def async_add_devices_discovery(hass, discovery_info, add_devices):
def async_add_devices_discovery(hass, discovery_info, async_add_devices):
"""Set up binary sensors for KNX platform configured via xknx.yaml."""
entities = []
for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
device = hass.data[DATA_KNX].xknx.devices[device_name]
entities.append(KNXBinarySensor(hass, device))
add_devices(entities)
async_add_devices(entities)


@callback
def async_add_devices_config(hass, config, add_devices):
def async_add_devices_config(hass, config, async_add_devices):
"""Set up binary senor for KNX platform configured within plattform."""
name = config.get(CONF_NAME)
import xknx
Expand All @@ -101,7 +101,7 @@ def async_add_devices_config(hass, config, add_devices):
entity.automations.append(KNXAutomation(
hass=hass, device=binary_sensor, hook=hook,
action=action, counter=counter))
add_devices([entity])
async_add_devices([entity])


class KNXBinarySensor(BinarySensorDevice):
Expand Down
4 changes: 2 additions & 2 deletions homeassistant/components/binary_sensor/spc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ def _create_sensor(hass, zone):


@asyncio.coroutine
def async_setup_platform(hass, config, async_add_entities,
def async_setup_platform(hass, config, async_add_devices,
discovery_info=None):
"""Initialize the platform."""
if (discovery_info is None or
discovery_info[ATTR_DISCOVER_DEVICES] is None):
return

async_add_entities(
async_add_devices(
_create_sensor(hass, zone)
for zone in discovery_info[ATTR_DISCOVER_DEVICES]
if _get_device_class(zone['type']))
Expand Down
14 changes: 7 additions & 7 deletions homeassistant/components/climate/knx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,33 +44,33 @@


@asyncio.coroutine
def async_setup_platform(hass, config, add_devices,
def async_setup_platform(hass, config, async_add_devices,
discovery_info=None):
"""Set up climate(s) for KNX platform."""
if DATA_KNX not in hass.data \
or not hass.data[DATA_KNX].initialized:
return False

if discovery_info is not None:
async_add_devices_discovery(hass, discovery_info, add_devices)
async_add_devices_discovery(hass, discovery_info, async_add_devices)
else:
async_add_devices_config(hass, config, add_devices)
async_add_devices_config(hass, config, async_add_devices)

return True


@callback
def async_add_devices_discovery(hass, discovery_info, add_devices):
def async_add_devices_discovery(hass, discovery_info, async_add_devices):
"""Set up climates for KNX platform configured within plattform."""
entities = []
for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
device = hass.data[DATA_KNX].xknx.devices[device_name]
entities.append(KNXClimate(hass, device))
add_devices(entities)
async_add_devices(entities)


@callback
def async_add_devices_config(hass, config, add_devices):
def async_add_devices_config(hass, config, async_add_devices):
"""Set up climate for KNX platform configured within plattform."""
import xknx
climate = xknx.devices.Climate(
Expand All @@ -97,7 +97,7 @@ def async_add_devices_config(hass, config, add_devices):
group_address_operation_mode_comfort=config.get(
CONF_OPERATION_MODE_COMFORT_ADDRESS))
hass.data[DATA_KNX].xknx.devices.add(climate)
add_devices([KNXClimate(hass, climate)])
async_add_devices([KNXClimate(hass, climate)])


class KNXClimate(ClimateDevice):
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/frontend/www_static/home-assistant-polymer
Open in desktop
Submodule home-assistant-polymer updated from 73289b to 07d5d6
14 changes: 7 additions & 7 deletions homeassistant/components/light/knx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,33 @@


@asyncio.coroutine
def async_setup_platform(hass, config, add_devices,
def async_setup_platform(hass, config, async_add_devices,
discovery_info=None):
"""Set up light(s) for KNX platform."""
if DATA_KNX not in hass.data \
or not hass.data[DATA_KNX].initialized:
return False

if discovery_info is not None:
async_add_devices_discovery(hass, discovery_info, add_devices)
async_add_devices_discovery(hass, discovery_info, async_add_devices)
else:
async_add_devices_config(hass, config, add_devices)
async_add_devices_config(hass, config, async_add_devices)

return True


@callback
def async_add_devices_discovery(hass, discovery_info, add_devices):
def async_add_devices_discovery(hass, discovery_info, async_add_devices):
"""Set up lights for KNX platform configured via xknx.yaml."""
entities = []
for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
device = hass.data[DATA_KNX].xknx.devices[device_name]
entities.append(KNXLight(hass, device))
add_devices(entities)
async_add_devices(entities)


@callback
def async_add_devices_config(hass, config, add_devices):
def async_add_devices_config(hass, config, async_add_devices):
"""Set up light for KNX platform configured within plattform."""
import xknx
light = xknx.devices.Light(
Expand All @@ -70,7 +70,7 @@ def async_add_devices_config(hass, config, add_devices):
group_address_brightness_state=config.get(
CONF_BRIGHTNESS_STATE_ADDRESS))
hass.data[DATA_KNX].xknx.devices.add(light)
add_devices([KNXLight(hass, light)])
async_add_devices([KNXLight(hass, light)])


class KNXLight(Light):
Expand Down
8 changes: 4 additions & 4 deletions homeassistant/components/sensor/citybikes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def async_citybikes_request(hass, uri, schema):

# pylint: disable=unused-argument
@asyncio.coroutine
def async_setup_platform(hass, config, async_add_entities,
def async_setup_platform(hass, config, async_add_devices,
discovery_info=None):
"""Set up the CityBikes platform."""
if DOMAIN not in hass.data:
Expand Down Expand Up @@ -159,7 +159,7 @@ def async_setup_platform(hass, config, async_add_entities,

yield from network.ready.wait()

entities = []
devices = []
for station in network.stations:
dist = location.distance(latitude, longitude,
station[ATTR_LATITUDE],
Expand All @@ -169,9 +169,9 @@ def async_setup_platform(hass, config, async_add_entities,

if radius > dist or stations_list.intersection((station_id,
station_uid)):
entities.append(CityBikesStation(network, station_id, name))
devices.append(CityBikesStation(network, station_id, name))

async_add_entities(entities, True)
async_add_devices(devices, True)


class CityBikesNetwork:
Expand Down
14 changes: 7 additions & 7 deletions homeassistant/components/sensor/knx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,33 @@


@asyncio.coroutine
def async_setup_platform(hass, config, add_devices,
def async_setup_platform(hass, config, async_add_devices,
discovery_info=None):
"""Set up sensor(s) for KNX platform."""
if DATA_KNX not in hass.data \
or not hass.data[DATA_KNX].initialized:
return False

if discovery_info is not None:
async_add_devices_discovery(hass, discovery_info, add_devices)
async_add_devices_discovery(hass, discovery_info, async_add_devices)
else:
async_add_devices_config(hass, config, add_devices)
async_add_devices_config(hass, config, async_add_devices)

return True


@callback
def async_add_devices_discovery(hass, discovery_info, add_devices):
def async_add_devices_discovery(hass, discovery_info, async_add_devices):
"""Set up sensors for KNX platform configured via xknx.yaml."""
entities = []
for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
device = hass.data[DATA_KNX].xknx.devices[device_name]
entities.append(KNXSensor(hass, device))
add_devices(entities)
async_add_devices(entities)


@callback
def async_add_devices_config(hass, config, add_devices):
def async_add_devices_config(hass, config, async_add_devices):
"""Set up sensor for KNX platform configured within plattform."""
import xknx
sensor = xknx.devices.Sensor(
Expand All @@ -63,7 +63,7 @@ def async_add_devices_config(hass, config, add_devices):
group_address=config.get(CONF_ADDRESS),
value_type=config.get(CONF_TYPE))
hass.data[DATA_KNX].xknx.devices.add(sensor)
add_devices([KNXSensor(hass, sensor)])
async_add_devices([KNXSensor(hass, sensor)])


class KNXSensor(Entity):
Expand Down
10 changes: 4 additions & 6 deletions homeassistant/components/sensor/worxlandroid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@


@asyncio.coroutine
def async_setup_platform(hass, config, async_add_entities,
def async_setup_platform(hass, config, async_add_devices,
discovery_info=None):
"""Set up the Worx Landroid sensors."""
for typ in ('battery', 'state'):
async_add_entities([WorxLandroidSensor(typ, config)])
async_add_devices([WorxLandroidSensor(typ, config)])


class WorxLandroidSensor(Entity):
Expand Down Expand Up @@ -86,8 +86,7 @@ def unit_of_measurement(self):
"""Return the unit of measurement of the sensor."""
if self.sensor == 'battery':
return '%'
else:
return None
return None

@asyncio.coroutine
def async_update(self):
Expand Down Expand Up @@ -159,7 +158,6 @@ def get_state(self, obj):
return 'charging-complete'
elif state_obj[15] == 1:
return 'going-home'
else:
return 'mowing'
return 'mowing'

return state
14 changes: 7 additions & 7 deletions homeassistant/components/switch/knx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,33 @@


@asyncio.coroutine
def async_setup_platform(hass, config, add_devices,
def async_setup_platform(hass, config, async_add_devices,
discovery_info=None):
"""Set up switch(es) for KNX platform."""
if DATA_KNX not in hass.data \
or not hass.data[DATA_KNX].initialized:
return False

if discovery_info is not None:
async_add_devices_discovery(hass, discovery_info, add_devices)
async_add_devices_discovery(hass, discovery_info, async_add_devices)
else:
async_add_devices_config(hass, config, add_devices)
async_add_devices_config(hass, config, async_add_devices)

return True


@callback
def async_add_devices_discovery(hass, discovery_info, add_devices):
def async_add_devices_discovery(hass, discovery_info, async_add_devices):
"""Set up switches for KNX platform configured via xknx.yaml."""
entities = []
for device_name in discovery_info[ATTR_DISCOVER_DEVICES]:
device = hass.data[DATA_KNX].xknx.devices[device_name]
entities.append(KNXSwitch(hass, device))
add_devices(entities)
async_add_devices(entities)


@callback
def async_add_devices_config(hass, config, add_devices):
def async_add_devices_config(hass, config, async_add_devices):
"""Set up switch for KNX platform configured within plattform."""
import xknx
switch = xknx.devices.Switch(
Expand All @@ -62,7 +62,7 @@ def async_add_devices_config(hass, config, add_devices):
group_address=config.get(CONF_ADDRESS),
group_address_state=config.get(CONF_STATE_ADDRESS))
hass.data[DATA_KNX].xknx.devices.add(switch)
add_devices([KNXSwitch(hass, switch)])
async_add_devices([KNXSwitch(hass, switch)])


class KNXSwitch(SwitchDevice):
Expand Down
2 changes: 1 addition & 1 deletion tests/components/alarm_control_panel/test_spc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def add_entities(entities):

yield from spc.async_setup_platform(hass=hass,
config={},
async_add_entities=add_entities,
async_add_devices=add_entities,
discovery_info=areas)

assert len(added_entities) == 2
Expand Down
2 changes: 1 addition & 1 deletion tests/components/binary_sensor/test_spc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def add_entities(entities):

yield from spc.async_setup_platform(hass=hass,
config={},
async_add_entities=add_entities,
async_add_devices=add_entities,
discovery_info=zones)

assert len(added_entities) == 3
Expand Down
0