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

Move imports in rfxtrx component (#27549)

Browse source
This commit is contained in:
javicalle 2019-10-12 21:37:59 +02:00 • committed by Paulus Schoutsen
parent 3873a1b070
commit 40e5beb0ed
9 changed files with 11 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
homeassistant/components/rfxtrx/__init__.py
View file

@ -1,7 +1,8 @@
"""Support for RFXtrx devices."""
from collections import OrderedDict
import binascii
import logging
import RFXtrx as rfxtrxmod
import voluptuous as vol
from homeassistant.const import (
@ -113,9 +114,6 @@ def setup(hass, config):
for subscriber in RECEIVED_EVT_SUBSCRIBERS:
subscriber(event)
# Try to load the RFXtrx module.
import RFXtrx as rfxtrxmod
device = config[DOMAIN][ATTR_DEVICE]
debug = config[DOMAIN][ATTR_DEBUG]
dummy_connection = config[DOMAIN][ATTR_DUMMY]
@ -144,8 +142,6 @@ def setup(hass, config):
def get_rfx_object(packetid):
"""Return the RFXObject with the packetid."""
import RFXtrx as rfxtrxmod
try:
binarypacket = bytearray.fromhex(packetid)
except ValueError:
@ -167,7 +163,6 @@ def get_pt2262_deviceid(device_id, nb_data_bits):
"""Extract and return the address bits from a Lighting4/PT2262 packet."""
if nb_data_bits is None:
return
import binascii
try:
data = bytearray.fromhex(device_id)

4
homeassistant/components/rfxtrx/binary_sensor.py
View file

@ -1,6 +1,6 @@
"""Support for RFXtrx binary sensors."""
import logging
import RFXtrx as rfxtrxmod
import voluptuous as vol
from homeassistant.components import rfxtrx
@ -54,8 +54,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
def setup_platform(hass, config, add_entities, discovery_info=None):
"""Set up the Binary Sensor platform to RFXtrx."""
import RFXtrx as rfxtrxmod
sensors = []
for packet_id, entity in config[CONF_DEVICES].items():

3
homeassistant/components/rfxtrx/cover.py
View file

@ -1,4 +1,5 @@
"""Support for RFXtrx covers."""
import RFXtrx as rfxtrxmod
import voluptuous as vol
from homeassistant.components import rfxtrx
@ -34,8 +35,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
def setup_platform(hass, config, add_entities, discovery_info=None):
"""Set up the RFXtrx cover."""
import RFXtrx as rfxtrxmod
covers = rfxtrx.get_devices_from_config(config, RfxtrxCover)
add_entities(covers)

4
homeassistant/components/rfxtrx/light.py
View file

@ -1,6 +1,6 @@
"""Support for RFXtrx lights."""
import logging
import RFXtrx as rfxtrxmod
import voluptuous as vol
from homeassistant.components import rfxtrx
@ -45,8 +45,6 @@ SUPPORT_RFXTRX = SUPPORT_BRIGHTNESS
def setup_platform(hass, config, add_entities, discovery_info=None):
"""Set up the RFXtrx platform."""
import RFXtrx as rfxtrxmod
lights = rfxtrx.get_devices_from_config(config, RfxtrxLight)
add_entities(lights)

5
homeassistant/components/rfxtrx/sensor.py
View file

@ -1,8 +1,9 @@
"""Support for RFXtrx sensors."""
import logging
import voluptuous as vol
from RFXtrx import SensorEvent
from homeassistant.components import rfxtrx
from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import ATTR_ENTITY_ID, ATTR_NAME, CONF_NAME
@ -43,8 +44,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
def setup_platform(hass, config, add_entities, discovery_info=None):
"""Set up the RFXtrx platform."""
from RFXtrx import SensorEvent
sensors = []
for packet_id, entity_info in config[CONF_DEVICES].items():
event = rfxtrx.get_rfx_object(packet_id)

4
homeassistant/components/rfxtrx/switch.py
View file

@ -1,6 +1,6 @@
"""Support for RFXtrx switches."""
import logging
import RFXtrx as rfxtrxmod
import voluptuous as vol
from homeassistant.components import rfxtrx
@ -38,8 +38,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
def setup_platform(hass, config, add_entities_callback, discovery_info=None):
"""Set up the RFXtrx platform."""
import RFXtrx as rfxtrxmod
# Add switch from config file
switches = rfxtrx.get_devices_from_config(config, RfxtrxSwitch)
add_entities_callback(switches)

4
tests/components/rfxtrx/test_cover.py
View file

@ -1,7 +1,7 @@
"""The tests for the Rfxtrx cover platform."""
import unittest
import pytest
import RFXtrx as rfxtrxmod
from homeassistant.setup import setup_component
from homeassistant.components import rfxtrx as rfxtrx_core
@ -142,8 +142,6 @@ class TestCoverRfxtrx(unittest.TestCase):
},
)
import RFXtrx as rfxtrxmod
rfxtrx_core.RFXOBJECT = rfxtrxmod.Core(
"", transport_protocol=rfxtrxmod.DummyTransport
)

4
tests/components/rfxtrx/test_light.py
View file

@ -1,7 +1,7 @@
"""The tests for the Rfxtrx light platform."""
import unittest
import pytest
import RFXtrx as rfxtrxmod
from homeassistant.setup import setup_component
from homeassistant.components import rfxtrx as rfxtrx_core
@ -109,8 +109,6 @@ class TestLightRfxtrx(unittest.TestCase):
},
)
import RFXtrx as rfxtrxmod
rfxtrx_core.RFXOBJECT = rfxtrxmod.Core(
"", transport_protocol=rfxtrxmod.DummyTransport
)

6
tests/components/rfxtrx/test_switch.py
View file

@ -1,7 +1,7 @@
"""The tests for the Rfxtrx switch platform."""
import unittest
import pytest
import RFXtrx as rfxtrxmod
from homeassistant.setup import setup_component
from homeassistant.components import rfxtrx as rfxtrx_core
@ -166,8 +166,6 @@ class TestSwitchRfxtrx(unittest.TestCase):
},
)
import RFXtrx as rfxtrxmod
rfxtrx_core.RFXOBJECT = rfxtrxmod.Core(
"", transport_protocol=rfxtrxmod.DummyTransport
)
@ -200,8 +198,6 @@ class TestSwitchRfxtrx(unittest.TestCase):
},
)
import RFXtrx as rfxtrxmod
rfxtrx_core.RFXOBJECT = rfxtrxmod.Core(
"", transport_protocol=rfxtrxmod.DummyTransport
)