Sort imports according to PEP8 for homekit (#29645)

This commit is contained in:
Bas Nijholt 2019-12-08 18:16:49 +01:00 committed by Franck Nijhof
parent aeff27680b
commit b731ddabde
11 changed files with 36 additions and 40 deletions

View File

@ -45,8 +45,8 @@ from .const import (
DEVICE_CLASS_PM25, DEVICE_CLASS_PM25,
DOMAIN, DOMAIN,
HOMEKIT_FILE, HOMEKIT_FILE,
SERVICE_HOMEKIT_START,
SERVICE_HOMEKIT_RESET_ACCESSORY, SERVICE_HOMEKIT_RESET_ACCESSORY,
SERVICE_HOMEKIT_START,
TYPE_FAUCET, TYPE_FAUCET,
TYPE_OUTLET, TYPE_OUTLET,
TYPE_SHOWER, TYPE_SHOWER,
@ -54,7 +54,6 @@ from .const import (
TYPE_SWITCH, TYPE_SWITCH,
TYPE_VALVE, TYPE_VALVE,
) )
from .util import ( from .util import (
show_setup_message, show_setup_message,
validate_entity_config, validate_entity_config,

View File

@ -6,16 +6,16 @@ from pyhap.const import CATEGORY_SWITCH, CATEGORY_TELEVISION
from homeassistant.components.media_player import ( from homeassistant.components.media_player import (
ATTR_INPUT_SOURCE, ATTR_INPUT_SOURCE,
ATTR_INPUT_SOURCE_LIST, ATTR_INPUT_SOURCE_LIST,
ATTR_MEDIA_VOLUME_MUTED,
ATTR_MEDIA_VOLUME_LEVEL, ATTR_MEDIA_VOLUME_LEVEL,
SERVICE_SELECT_SOURCE, ATTR_MEDIA_VOLUME_MUTED,
DOMAIN, DOMAIN,
SERVICE_SELECT_SOURCE,
SUPPORT_PAUSE, SUPPORT_PAUSE,
SUPPORT_PLAY, SUPPORT_PLAY,
SUPPORT_SELECT_SOURCE,
SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_MUTE,
SUPPORT_VOLUME_SET, SUPPORT_VOLUME_SET,
SUPPORT_VOLUME_STEP, SUPPORT_VOLUME_STEP,
SUPPORT_SELECT_SOURCE,
) )
from homeassistant.const import ( from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_ENTITY_ID,
@ -26,13 +26,13 @@ from homeassistant.const import (
SERVICE_MEDIA_STOP, SERVICE_MEDIA_STOP,
SERVICE_TURN_OFF, SERVICE_TURN_OFF,
SERVICE_TURN_ON, SERVICE_TURN_ON,
SERVICE_VOLUME_MUTE,
SERVICE_VOLUME_UP,
SERVICE_VOLUME_DOWN, SERVICE_VOLUME_DOWN,
SERVICE_VOLUME_MUTE,
SERVICE_VOLUME_SET, SERVICE_VOLUME_SET,
SERVICE_VOLUME_UP,
STATE_OFF, STATE_OFF,
STATE_PLAYING,
STATE_PAUSED, STATE_PAUSED,
STATE_PLAYING,
STATE_UNKNOWN, STATE_UNKNOWN,
) )
@ -46,23 +46,23 @@ from .const import (
CHAR_IDENTIFIER, CHAR_IDENTIFIER,
CHAR_INPUT_SOURCE_TYPE, CHAR_INPUT_SOURCE_TYPE,
CHAR_IS_CONFIGURED, CHAR_IS_CONFIGURED,
CHAR_NAME,
CHAR_SLEEP_DISCOVER_MODE,
CHAR_MUTE, CHAR_MUTE,
CHAR_NAME,
CHAR_ON, CHAR_ON,
CHAR_REMOTE_KEY, CHAR_REMOTE_KEY,
CHAR_SLEEP_DISCOVER_MODE,
CHAR_VOLUME,
CHAR_VOLUME_CONTROL_TYPE, CHAR_VOLUME_CONTROL_TYPE,
CHAR_VOLUME_SELECTOR, CHAR_VOLUME_SELECTOR,
CHAR_VOLUME,
CONF_FEATURE_LIST, CONF_FEATURE_LIST,
FEATURE_ON_OFF, FEATURE_ON_OFF,
FEATURE_PLAY_PAUSE, FEATURE_PLAY_PAUSE,
FEATURE_PLAY_STOP, FEATURE_PLAY_STOP,
FEATURE_TOGGLE_MUTE, FEATURE_TOGGLE_MUTE,
SERV_INPUT_SOURCE,
SERV_SWITCH, SERV_SWITCH,
SERV_TELEVISION, SERV_TELEVISION,
SERV_TELEVISION_SPEAKER, SERV_TELEVISION_SPEAKER,
SERV_INPUT_SOURCE,
) )
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)

View File

@ -20,12 +20,12 @@ from homeassistant.components.climate.const import (
DEFAULT_MAX_TEMP, DEFAULT_MAX_TEMP,
DEFAULT_MIN_TEMP, DEFAULT_MIN_TEMP,
DOMAIN as DOMAIN_CLIMATE, DOMAIN as DOMAIN_CLIMATE,
HVAC_MODE_AUTO,
HVAC_MODE_COOL, HVAC_MODE_COOL,
HVAC_MODE_FAN_ONLY,
HVAC_MODE_HEAT, HVAC_MODE_HEAT,
HVAC_MODE_HEAT_COOL, HVAC_MODE_HEAT_COOL,
HVAC_MODE_OFF, HVAC_MODE_OFF,
HVAC_MODE_AUTO,
HVAC_MODE_FAN_ONLY,
SERVICE_SET_HVAC_MODE as SERVICE_SET_HVAC_MODE_THERMOSTAT, SERVICE_SET_HVAC_MODE as SERVICE_SET_HVAC_MODE_THERMOSTAT,
SERVICE_SET_TEMPERATURE as SERVICE_SET_TEMPERATURE_THERMOSTAT, SERVICE_SET_TEMPERATURE as SERVICE_SET_TEMPERATURE_THERMOSTAT,
SUPPORT_TARGET_TEMPERATURE_RANGE, SUPPORT_TARGET_TEMPERATURE_RANGE,

View File

@ -1,13 +1,12 @@
"""HomeKit session fixtures.""" """HomeKit session fixtures."""
from unittest.mock import patch from unittest.mock import patch
from pyhap.accessory_driver import AccessoryDriver
import pytest import pytest
from homeassistant.components.homekit.const import EVENT_HOMEKIT_CHANGED from homeassistant.components.homekit.const import EVENT_HOMEKIT_CHANGED
from homeassistant.core import callback as ha_callback from homeassistant.core import callback as ha_callback
from pyhap.accessory_driver import AccessoryDriver
@pytest.fixture(scope="session") @pytest.fixture(scope="session")
def hk_driver(): def hk_driver():

View File

@ -3,15 +3,15 @@
This includes tests for all mock object types. This includes tests for all mock object types.
""" """
from datetime import datetime, timedelta from datetime import datetime, timedelta
from unittest.mock import patch, Mock from unittest.mock import Mock, patch
import pytest import pytest
from homeassistant.components.homekit.accessories import ( from homeassistant.components.homekit.accessories import (
debounce,
HomeAccessory, HomeAccessory,
HomeBridge, HomeBridge,
HomeDriver, HomeDriver,
debounce,
) )
from homeassistant.components.homekit.const import ( from homeassistant.components.homekit.const import (
ATTR_DISPLAY_NAME, ATTR_DISPLAY_NAME,
@ -30,13 +30,13 @@ from homeassistant.components.homekit.const import (
SERV_ACCESSORY_INFO, SERV_ACCESSORY_INFO,
) )
from homeassistant.const import ( from homeassistant.const import (
__version__,
ATTR_BATTERY_CHARGING, ATTR_BATTERY_CHARGING,
ATTR_BATTERY_LEVEL, ATTR_BATTERY_LEVEL,
ATTR_ENTITY_ID, ATTR_ENTITY_ID,
ATTR_SERVICE,
ATTR_NOW, ATTR_NOW,
ATTR_SERVICE,
EVENT_TIME_CHANGED, EVENT_TIME_CHANGED,
__version__,
) )
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util

View File

@ -1,13 +1,11 @@
"""Package to test the get_accessory method.""" """Package to test the get_accessory method."""
from unittest.mock import patch, Mock from unittest.mock import Mock, patch
import pytest import pytest
from homeassistant.core import State
import homeassistant.components.cover as cover
import homeassistant.components.climate as climate import homeassistant.components.climate as climate
import homeassistant.components.media_player.const as media_player_c import homeassistant.components.cover as cover
from homeassistant.components.homekit import get_accessory, TYPES from homeassistant.components.homekit import TYPES, get_accessory
from homeassistant.components.homekit.const import ( from homeassistant.components.homekit.const import (
CONF_FEATURE_LIST, CONF_FEATURE_LIST,
FEATURE_ON_OFF, FEATURE_ON_OFF,
@ -18,6 +16,7 @@ from homeassistant.components.homekit.const import (
TYPE_SWITCH, TYPE_SWITCH,
TYPE_VALVE, TYPE_VALVE,
) )
import homeassistant.components.media_player.const as media_player_c
from homeassistant.const import ( from homeassistant.const import (
ATTR_CODE, ATTR_CODE,
ATTR_DEVICE_CLASS, ATTR_DEVICE_CLASS,
@ -28,6 +27,7 @@ from homeassistant.const import (
TEMP_CELSIUS, TEMP_CELSIUS,
TEMP_FAHRENHEIT, TEMP_FAHRENHEIT,
) )
from homeassistant.core import State
def test_not_supported(caplog): def test_not_supported(caplog):

View File

@ -1,35 +1,34 @@
"""Tests for the HomeKit component.""" """Tests for the HomeKit component."""
from unittest.mock import patch, ANY, Mock from unittest.mock import ANY, Mock, patch
import pytest import pytest
from homeassistant import setup from homeassistant import setup
from homeassistant.components.homekit import ( from homeassistant.components.homekit import (
generate_aid,
HomeKit,
MAX_DEVICES, MAX_DEVICES,
STATUS_READY, STATUS_READY,
STATUS_RUNNING, STATUS_RUNNING,
STATUS_STOPPED, STATUS_STOPPED,
STATUS_WAIT, STATUS_WAIT,
HomeKit,
generate_aid,
) )
from homeassistant.components.homekit.accessories import HomeBridge from homeassistant.components.homekit.accessories import HomeBridge
from homeassistant.components.homekit.const import ( from homeassistant.components.homekit.const import (
BRIDGE_NAME,
CONF_AUTO_START, CONF_AUTO_START,
CONF_SAFE_MODE, CONF_SAFE_MODE,
BRIDGE_NAME,
DEFAULT_PORT, DEFAULT_PORT,
DEFAULT_SAFE_MODE, DEFAULT_SAFE_MODE,
DOMAIN, DOMAIN,
HOMEKIT_FILE, HOMEKIT_FILE,
SERVICE_HOMEKIT_START,
SERVICE_HOMEKIT_RESET_ACCESSORY, SERVICE_HOMEKIT_RESET_ACCESSORY,
SERVICE_HOMEKIT_START,
) )
from homeassistant.const import ( from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_ENTITY_ID,
CONF_NAME,
CONF_IP_ADDRESS, CONF_IP_ADDRESS,
CONF_NAME,
CONF_PORT, CONF_PORT,
EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_START,
EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_STOP,
@ -39,7 +38,6 @@ from homeassistant.helpers.entityfilter import generate_filter
from tests.components.homekit.common import patch_debounce from tests.components.homekit.common import patch_debounce
IP_ADDRESS = "127.0.0.1" IP_ADDRESS = "127.0.0.1"
PATH_HOMEKIT = "homeassistant.components.homekit" PATH_HOMEKIT = "homeassistant.components.homekit"

View File

@ -11,14 +11,14 @@ from homeassistant.components.light import (
ATTR_HS_COLOR, ATTR_HS_COLOR,
DOMAIN, DOMAIN,
SUPPORT_BRIGHTNESS, SUPPORT_BRIGHTNESS,
SUPPORT_COLOR_TEMP,
SUPPORT_COLOR, SUPPORT_COLOR,
SUPPORT_COLOR_TEMP,
) )
from homeassistant.const import ( from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_ENTITY_ID,
ATTR_SUPPORTED_FEATURES, ATTR_SUPPORTED_FEATURES,
STATE_ON,
STATE_OFF, STATE_OFF,
STATE_ON,
STATE_UNKNOWN, STATE_UNKNOWN,
) )

View File

@ -8,11 +8,11 @@ from homeassistant.components.homekit.const import (
FEATURE_PLAY_STOP, FEATURE_PLAY_STOP,
FEATURE_TOGGLE_MUTE, FEATURE_TOGGLE_MUTE,
) )
from homeassistant.components.media_player import DEVICE_CLASS_TV
from homeassistant.components.homekit.type_media_players import ( from homeassistant.components.homekit.type_media_players import (
MediaPlayer, MediaPlayer,
TelevisionMediaPlayer, TelevisionMediaPlayer,
) )
from homeassistant.components.media_player import DEVICE_CLASS_TV
from homeassistant.components.media_player.const import ( from homeassistant.components.media_player.const import (
ATTR_INPUT_SOURCE, ATTR_INPUT_SOURCE,
ATTR_INPUT_SOURCE_LIST, ATTR_INPUT_SOURCE_LIST,

View File

@ -5,14 +5,14 @@ from homeassistant.components.homekit.const import (
THRESHOLD_CO2, THRESHOLD_CO2,
) )
from homeassistant.components.homekit.type_sensors import ( from homeassistant.components.homekit.type_sensors import (
BINARY_SENSOR_SERVICE_MAP,
AirQualitySensor, AirQualitySensor,
BinarySensor, BinarySensor,
CarbonMonoxideSensor,
CarbonDioxideSensor, CarbonDioxideSensor,
CarbonMonoxideSensor,
HumiditySensor, HumiditySensor,
LightSensor, LightSensor,
TemperatureSensor, TemperatureSensor,
BINARY_SENSOR_SERVICE_MAP,
) )
from homeassistant.const import ( from homeassistant.const import (
ATTR_DEVICE_CLASS, ATTR_DEVICE_CLASS,

View File

@ -20,12 +20,12 @@ from homeassistant.components.climate.const import (
DEFAULT_MAX_TEMP, DEFAULT_MAX_TEMP,
DEFAULT_MIN_TEMP, DEFAULT_MIN_TEMP,
DOMAIN as DOMAIN_CLIMATE, DOMAIN as DOMAIN_CLIMATE,
HVAC_MODE_AUTO,
HVAC_MODE_COOL, HVAC_MODE_COOL,
HVAC_MODE_FAN_ONLY,
HVAC_MODE_HEAT, HVAC_MODE_HEAT,
HVAC_MODE_HEAT_COOL, HVAC_MODE_HEAT_COOL,
HVAC_MODE_OFF, HVAC_MODE_OFF,
HVAC_MODE_FAN_ONLY,
HVAC_MODE_AUTO,
) )
from homeassistant.components.homekit.const import ( from homeassistant.components.homekit.const import (
ATTR_VALUE, ATTR_VALUE,