Sort imports according to PEP8 for zwave (#29658)

This commit is contained in:
Bas Nijholt 2019-12-09 12:29:12 +01:00 committed by Franck Nijhof
parent 41cd678f00
commit 16a7408f23
24 changed files with 114 additions and 105 deletions

View file

@ -8,62 +8,60 @@ from pprint import pprint
import voluptuous as vol
from homeassistant import config_entries
from homeassistant.core import callback, CoreState
from homeassistant.const import (
ATTR_ENTITY_ID,
EVENT_HOMEASSISTANT_START,
EVENT_HOMEASSISTANT_STOP,
)
from homeassistant.core import CoreState, callback
from homeassistant.helpers import discovery
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.device_registry import (
async_get_registry as async_get_device_registry,
)
from homeassistant.helpers.dispatcher import (
async_dispatcher_connect,
async_dispatcher_send,
)
from homeassistant.helpers.entity import generate_entity_id
from homeassistant.helpers.entity_component import DEFAULT_SCAN_INTERVAL
from homeassistant.helpers.entity_platform import EntityPlatform
from homeassistant.helpers.entity_registry import (
async_get_registry as async_get_entity_registry,
)
from homeassistant.helpers.device_registry import (
async_get_registry as async_get_device_registry,
)
from homeassistant.const import (
ATTR_ENTITY_ID,
EVENT_HOMEASSISTANT_START,
EVENT_HOMEASSISTANT_STOP,
)
from homeassistant.helpers.entity_values import EntityValues
from homeassistant.helpers.event import async_track_time_change
from homeassistant.util import convert
import homeassistant.util.dt as dt_util
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.dispatcher import (
async_dispatcher_connect,
async_dispatcher_send,
)
from . import const
from . import config_flow # noqa: F401 pylint: disable=unused-import
from . import websocket_api as wsapi
from . import const, websocket_api as wsapi, workaround
from .const import (
CONF_AUTOHEAL,
CONF_CONFIG_PATH,
CONF_DEBUG,
CONF_NETWORK_KEY,
CONF_POLLING_INTERVAL,
CONF_USB_STICK_PATH,
CONF_CONFIG_PATH,
CONF_NETWORK_KEY,
DATA_DEVICES,
DATA_ENTITY_VALUES,
DATA_NETWORK,
DATA_ZWAVE_CONFIG,
DEFAULT_CONF_AUTOHEAL,
DEFAULT_CONF_USB_STICK_PATH,
DEFAULT_POLLING_INTERVAL,
DEFAULT_DEBUG,
DEFAULT_POLLING_INTERVAL,
DOMAIN,
DATA_DEVICES,
DATA_NETWORK,
DATA_ENTITY_VALUES,
DATA_ZWAVE_CONFIG,
)
from .node_entity import ZWaveBaseEntity, ZWaveNodeEntity
from . import workaround
from .discovery_schemas import DISCOVERY_SCHEMAS
from .node_entity import ZWaveBaseEntity, ZWaveNodeEntity
from .util import (
check_has_unique_id,
check_node_schema,
check_value_schema,
node_name,
check_has_unique_id,
is_node_parsed,
node_device_id_and_name,
node_name,
)
_LOGGER = logging.getLogger(__name__)

View file

@ -1,12 +1,14 @@
"""Support for Z-Wave binary sensors."""
import logging
import datetime
import homeassistant.util.dt as dt_util
import logging
from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDevice
from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.helpers.event import track_point_in_time
from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDevice
from . import workaround, ZWaveDeviceEntity
import homeassistant.util.dt as dt_util
from . import ZWaveDeviceEntity, workaround
from .const import COMMAND_CLASS_SENSOR_BINARY
_LOGGER = logging.getLogger(__name__)

View file

@ -1,11 +1,12 @@
"""Support for Z-Wave climate devices."""
# Because we do not compile openzwave on CI
import logging
from typing import Optional
from homeassistant.components.climate import ClimateDevice
from homeassistant.components.climate.const import (
ATTR_TARGET_TEMP_HIGH,
ATTR_TARGET_TEMP_LOW,
CURRENT_HVAC_COOL,
CURRENT_HVAC_FAN,
CURRENT_HVAC_HEAT,
@ -14,28 +15,25 @@ from homeassistant.components.climate.const import (
DOMAIN,
HVAC_MODE_AUTO,
HVAC_MODE_COOL,
HVAC_MODE_HEAT,
HVAC_MODE_HEAT_COOL,
HVAC_MODE_DRY,
HVAC_MODE_FAN_ONLY,
HVAC_MODE_HEAT,
HVAC_MODE_HEAT_COOL,
HVAC_MODE_OFF,
PRESET_AWAY,
PRESET_BOOST,
PRESET_NONE,
SUPPORT_AUX_HEAT,
SUPPORT_FAN_MODE,
SUPPORT_PRESET_MODE,
SUPPORT_SWING_MODE,
SUPPORT_TARGET_TEMPERATURE,
SUPPORT_TARGET_TEMPERATURE_RANGE,
SUPPORT_PRESET_MODE,
ATTR_TARGET_TEMP_LOW,
ATTR_TARGET_TEMP_HIGH,
)
from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS, TEMP_FAHRENHEIT
from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from . import ZWaveDeviceEntity
_LOGGER = logging.getLogger(__name__)

View file

@ -7,8 +7,8 @@ import voluptuous as vol
from homeassistant import config_entries
from .const import (
CONF_USB_STICK_PATH,
CONF_NETWORK_KEY,
CONF_USB_STICK_PATH,
DEFAULT_CONF_USB_STICK_PATH,
DOMAIN,
)

View file

@ -1,24 +1,26 @@
"""Support for Z-Wave covers."""
import logging
from homeassistant.core import callback
from homeassistant.components.cover import (
DOMAIN,
SUPPORT_OPEN,
SUPPORT_CLOSE,
ATTR_POSITION,
DOMAIN,
SUPPORT_CLOSE,
SUPPORT_OPEN,
CoverDevice,
)
from homeassistant.components.cover import CoverDevice
from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from . import (
ZWaveDeviceEntity,
CONF_INVERT_OPENCLOSE_BUTTONS,
CONF_INVERT_PERCENT,
ZWaveDeviceEntity,
workaround,
)
from .const import (
COMMAND_CLASS_SWITCH_MULTILEVEL,
COMMAND_CLASS_SWITCH_BINARY,
COMMAND_CLASS_BARRIER_OPERATOR,
COMMAND_CLASS_SWITCH_BINARY,
COMMAND_CLASS_SWITCH_MULTILEVEL,
DATA_NETWORK,
)

View file

@ -2,17 +2,18 @@
import logging
import math
from homeassistant.core import callback
from homeassistant.components.fan import (
DOMAIN,
FanEntity,
SPEED_OFF,
SPEED_HIGH,
SPEED_LOW,
SPEED_MEDIUM,
SPEED_HIGH,
SPEED_OFF,
SUPPORT_SET_SPEED,
FanEntity,
)
from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from . import ZWaveDeviceEntity
_LOGGER = logging.getLogger(__name__)

View file

@ -1,26 +1,27 @@
"""Support for Z-Wave lights."""
import logging
from threading import Timer
from homeassistant.core import callback
from homeassistant.components.light import (
ATTR_WHITE_VALUE,
ATTR_BRIGHTNESS,
ATTR_COLOR_TEMP,
ATTR_HS_COLOR,
ATTR_TRANSITION,
ATTR_WHITE_VALUE,
DOMAIN,
SUPPORT_BRIGHTNESS,
SUPPORT_COLOR_TEMP,
SUPPORT_COLOR,
SUPPORT_COLOR_TEMP,
SUPPORT_TRANSITION,
SUPPORT_WHITE_VALUE,
DOMAIN,
Light,
)
from homeassistant.const import STATE_OFF, STATE_ON
from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
import homeassistant.util.color as color_util
from . import CONF_REFRESH_VALUE, CONF_REFRESH_DELAY, const, ZWaveDeviceEntity
from . import CONF_REFRESH_DELAY, CONF_REFRESH_VALUE, ZWaveDeviceEntity, const
_LOGGER = logging.getLogger(__name__)

View file

@ -3,10 +3,11 @@ import logging
import voluptuous as vol
from homeassistant.core import callback
from homeassistant.components.lock import DOMAIN, LockDevice
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.core import callback
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from . import ZWaveDeviceEntity, const
_LOGGER = logging.getLogger(__name__)

View file

@ -1,26 +1,26 @@
"""Entity class that represents Z-Wave node."""
import logging
from itertools import count
import logging
from homeassistant.const import ATTR_BATTERY_LEVEL, ATTR_ENTITY_ID, ATTR_WAKEUP
from homeassistant.core import callback
from homeassistant.const import ATTR_BATTERY_LEVEL, ATTR_WAKEUP, ATTR_ENTITY_ID
from homeassistant.helpers.entity_registry import async_get_registry
from homeassistant.helpers.device_registry import async_get_registry as get_dev_reg
from homeassistant.helpers.entity import Entity
from homeassistant.helpers.entity_registry import async_get_registry
from .const import (
ATTR_NODE_ID,
COMMAND_CLASS_WAKE_UP,
ATTR_SCENE_ID,
ATTR_SCENE_DATA,
ATTR_BASIC_LEVEL,
EVENT_NODE_EVENT,
EVENT_SCENE_ACTIVATED,
ATTR_NODE_ID,
ATTR_SCENE_DATA,
ATTR_SCENE_ID,
COMMAND_CLASS_CENTRAL_SCENE,
COMMAND_CLASS_VERSION,
COMMAND_CLASS_WAKE_UP,
DOMAIN,
EVENT_NODE_EVENT,
EVENT_SCENE_ACTIVATED,
)
from .util import node_name, is_node_parsed, node_device_id_and_name
from .util import is_node_parsed, node_device_id_and_name, node_name
_LOGGER = logging.getLogger(__name__)

View file

@ -1,10 +1,12 @@
"""Support for Z-Wave sensors."""
import logging
from homeassistant.core import callback
from homeassistant.components.sensor import DOMAIN, DEVICE_CLASS_BATTERY
from homeassistant.components.sensor import DEVICE_CLASS_BATTERY, DOMAIN
from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from . import const, ZWaveDeviceEntity
from . import ZWaveDeviceEntity, const
_LOGGER = logging.getLogger(__name__)

View file

@ -1,9 +1,11 @@
"""Support for Z-Wave switches."""
import logging
import time
from homeassistant.core import callback
from homeassistant.components.switch import DOMAIN, SwitchDevice
from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from . import ZWaveDeviceEntity, workaround
_LOGGER = logging.getLogger(__name__)

View file

@ -1,5 +1,5 @@
"""Fixtures for Z-Wave tests."""
from unittest.mock import patch, MagicMock
from unittest.mock import MagicMock, patch
import pytest

View file

@ -1,11 +1,10 @@
"""Test Z-Wave binary sensors."""
import datetime
from unittest.mock import patch
from homeassistant.components.zwave import const, binary_sensor
from homeassistant.components.zwave import binary_sensor, const
from tests.mock.zwave import MockNode, MockValue, MockEntityValues, value_changed
from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed
def test_get_device_detects_none(mock_openzwave):

View file

@ -2,13 +2,15 @@
import pytest
from homeassistant.components.climate.const import (
CURRENT_HVAC_HEAT,
ATTR_TARGET_TEMP_HIGH,
ATTR_TARGET_TEMP_LOW,
CURRENT_HVAC_COOL,
HVAC_MODES,
CURRENT_HVAC_HEAT,
HVAC_MODE_COOL,
HVAC_MODE_HEAT,
HVAC_MODE_HEAT_COOL,
HVAC_MODE_OFF,
HVAC_MODES,
PRESET_AWAY,
PRESET_BOOST,
PRESET_ECO,
@ -18,8 +20,6 @@ from homeassistant.components.climate.const import (
SUPPORT_SWING_MODE,
SUPPORT_TARGET_TEMPERATURE,
SUPPORT_TARGET_TEMPERATURE_RANGE,
ATTR_TARGET_TEMP_LOW,
ATTR_TARGET_TEMP_HIGH,
)
from homeassistant.components.zwave import climate
from homeassistant.components.zwave.climate import DEFAULT_HVAC_MODES

View file

@ -1,15 +1,15 @@
"""Test Z-Wave cover devices."""
from unittest.mock import MagicMock
from homeassistant.components.cover import SUPPORT_OPEN, SUPPORT_CLOSE
from homeassistant.components.cover import SUPPORT_CLOSE, SUPPORT_OPEN
from homeassistant.components.zwave import (
const,
cover,
CONF_INVERT_OPENCLOSE_BUTTONS,
CONF_INVERT_PERCENT,
const,
cover,
)
from tests.mock.zwave import MockNode, MockValue, MockEntityValues, value_changed
from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed
def test_get_device_detects_none(hass, mock_openzwave):

View file

@ -1,14 +1,14 @@
"""Test Z-Wave fans."""
from homeassistant.components.zwave import fan
from homeassistant.components.fan import (
SPEED_OFF,
SPEED_HIGH,
SPEED_LOW,
SPEED_MEDIUM,
SPEED_HIGH,
SPEED_OFF,
SUPPORT_SET_SPEED,
)
from homeassistant.components.zwave import fan
from tests.mock.zwave import MockNode, MockValue, MockEntityValues, value_changed
from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed
def test_get_device_detects_fan(mock_openzwave):

View file

@ -19,8 +19,8 @@ from homeassistant.components.zwave import (
)
from homeassistant.components.zwave.binary_sensor import get_device
from homeassistant.const import ATTR_ENTITY_ID, EVENT_HOMEASSISTANT_START
from homeassistant.helpers.entity_registry import async_get_registry
from homeassistant.helpers.device_registry import async_get_registry as get_dev_reg
from homeassistant.helpers.entity_registry import async_get_registry
from homeassistant.setup import setup_component
from tests.common import (

View file

@ -1,22 +1,22 @@
"""Test Z-Wave lights."""
from unittest.mock import patch, MagicMock
from unittest.mock import MagicMock, patch
from homeassistant.components import zwave
from homeassistant.components.zwave import const, light
from homeassistant.components.light import (
ATTR_BRIGHTNESS,
ATTR_COLOR_TEMP,
ATTR_HS_COLOR,
ATTR_TRANSITION,
SUPPORT_BRIGHTNESS,
SUPPORT_TRANSITION,
SUPPORT_COLOR,
ATTR_WHITE_VALUE,
SUPPORT_BRIGHTNESS,
SUPPORT_COLOR,
SUPPORT_COLOR_TEMP,
SUPPORT_TRANSITION,
SUPPORT_WHITE_VALUE,
)
from homeassistant.components.zwave import const, light
from tests.mock.zwave import MockNode, MockValue, MockEntityValues, value_changed
from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed
class MockLightValues(MockEntityValues):

View file

@ -1,10 +1,10 @@
"""Test Z-Wave locks."""
from unittest.mock import patch, MagicMock
from unittest.mock import MagicMock, patch
from homeassistant import config_entries
from homeassistant.components.zwave import const, lock
from tests.mock.zwave import MockNode, MockValue, MockEntityValues, value_changed
from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed
def test_get_device_detects_lock(mock_openzwave):

View file

@ -1,11 +1,14 @@
"""Test Z-Wave node entity."""
import unittest
from unittest.mock import patch, MagicMock
import tests.mock.zwave as mock_zwave
from unittest.mock import MagicMock, patch
import pytest
from homeassistant.components.zwave import node_entity, const
from homeassistant.components.zwave import const, node_entity
from homeassistant.const import ATTR_ENTITY_ID
import tests.mock.zwave as mock_zwave
async def test_maybe_schedule_update(hass, mock_openzwave):
"""Test maybe schedule update."""

View file

@ -2,7 +2,7 @@
from homeassistant.components.zwave import const, sensor
import homeassistant.const
from tests.mock.zwave import MockNode, MockValue, MockEntityValues, value_changed
from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed
def test_get_device_detects_none(mock_openzwave):

View file

@ -3,7 +3,7 @@ from unittest.mock import patch
from homeassistant.components.zwave import switch
from tests.mock.zwave import MockNode, MockValue, MockEntityValues, value_changed
from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed
def test_get_device_detects_switch(mock_openzwave):

View file

@ -1,10 +1,9 @@
"""Test Z-Wave Websocket API."""
from homeassistant.bootstrap import async_setup_component
from homeassistant.components.zwave.const import (
CONF_USB_STICK_PATH,
CONF_AUTOHEAL,
CONF_POLLING_INTERVAL,
CONF_USB_STICK_PATH,
)
from homeassistant.components.zwave.websocket_api import ID, TYPE

View file

@ -1,5 +1,6 @@
"""Test Z-Wave workarounds."""
from homeassistant.components.zwave import const, workaround
from tests.mock.zwave import MockNode, MockValue