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

move imports in tellstick component (#27600)

Browse source
This commit is contained in:
Michał Mrozek 2019-10-13 22:55:43 +02:00 • committed by Paulus Schoutsen
parent d8b73f9459
commit c5dc670b36
2 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
homeassistant/components/tellstick/__init__.py
View file

@ -2,13 +2,22 @@
import logging import logging
import threading import threading
from tellcore.constants import (
TELLSTICK_DIM,
TELLSTICK_TURNOFF,
TELLSTICK_TURNON,
TELLSTICK_UP,
)
from tellcore.library import TelldusError
from tellcore.telldus import AsyncioCallbackDispatcher, TelldusCore
from tellcorenet import TellCoreClient
import voluptuous as vol import voluptuous as vol
from homeassistant.helpers import discovery from homeassistant.const import CONF_HOST, CONF_PORT, EVENT_HOMEASSISTANT_STOP
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.const import EVENT_HOMEASSISTANT_STOP, CONF_HOST, CONF_PORT from homeassistant.helpers import discovery
from homeassistant.helpers.entity import Entity
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import Entity
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -73,10 +82,6 @@ def _discover(hass, config, component_name, found_tellcore_devices):
def setup(hass, config): def setup(hass, config):
"""Set up the Tellstick component.""" """Set up the Tellstick component."""
from tellcore.constants import TELLSTICK_DIM, TELLSTICK_UP
from tellcore.telldus import AsyncioCallbackDispatcher
from tellcore.telldus import TelldusCore
from tellcorenet import TellCoreClient
conf = config.get(DOMAIN, {}) conf = config.get(DOMAIN, {})
net_host = conf.get(CONF_HOST) net_host = conf.get(CONF_HOST)
@ -219,7 +224,6 @@ class TellstickDevice(Entity):
def _send_repeated_command(self): def _send_repeated_command(self):
"""Send a tellstick command once and decrease the repeat count.""" """Send a tellstick command once and decrease the repeat count."""
from tellcore.library import TelldusError
with TELLSTICK_LOCK: with TELLSTICK_LOCK:
if self._repeats_left > 0: if self._repeats_left > 0:
@ -259,11 +263,6 @@ class TellstickDevice(Entity):
def _update_model_from_command(self, tellcore_command, tellcore_data): def _update_model_from_command(self, tellcore_command, tellcore_data):
"""Update the model, from a sent tellcore command and data.""" """Update the model, from a sent tellcore command and data."""
from tellcore.constants import (
TELLSTICK_TURNON,
TELLSTICK_TURNOFF,
TELLSTICK_DIM,
)
if tellcore_command not in [TELLSTICK_TURNON, TELLSTICK_TURNOFF, TELLSTICK_DIM]: if tellcore_command not in [TELLSTICK_TURNON, TELLSTICK_TURNOFF, TELLSTICK_DIM]:
_LOGGER.debug("Unhandled tellstick command: %d", tellcore_command) _LOGGER.debug("Unhandled tellstick command: %d", tellcore_command)
@ -289,12 +288,6 @@ class TellstickDevice(Entity):
def _update_from_tellcore(self): def _update_from_tellcore(self):
"""Read the current state of the device from the tellcore library.""" """Read the current state of the device from the tellcore library."""
from tellcore.library import TelldusError
from tellcore.constants import (
TELLSTICK_TURNON,
TELLSTICK_TURNOFF,
TELLSTICK_DIM,
)
with TELLSTICK_LOCK: with TELLSTICK_LOCK:
try: try:

10
homeassistant/components/tellstick/sensor.py
View file

@ -1,13 +1,15 @@
"""Support for Tellstick sensors.""" """Support for Tellstick sensors."""
import logging
from collections import namedtuple from collections import namedtuple
import logging
from tellcore import telldus
import tellcore.constants as tellcore_constants
import voluptuous as vol import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import TEMP_CELSIUS, CONF_ID, CONF_NAME, CONF_PROTOCOL from homeassistant.const import CONF_ID, CONF_NAME, CONF_PROTOCOL, TEMP_CELSIUS
from homeassistant.helpers.entity import Entity
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import Entity
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -48,8 +50,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
def setup_platform(hass, config, add_entities, discovery_info=None): def setup_platform(hass, config, add_entities, discovery_info=None):
"""Set up the Tellstick sensors.""" """Set up the Tellstick sensors."""
from tellcore import telldus
import tellcore.constants as tellcore_constants
sensor_value_descriptions = { sensor_value_descriptions = {
tellcore_constants.TELLSTICK_TEMPERATURE: DatatypeDescription( tellcore_constants.TELLSTICK_TEMPERATURE: DatatypeDescription(