From 4c5c34919d535ef3e2f21dc6a668c4a270ee1758 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 9 Dec 2019 11:50:48 +0100 Subject: [PATCH] Sort imports according to PEP8 for camera (#29691) --- homeassistant/components/camera/__init__.py | 55 ++++++++++----------- homeassistant/components/camera/prefs.py | 1 - tests/components/camera/common.py | 4 +- tests/components/camera/test_init.py | 14 +++--- 4 files changed, 36 insertions(+), 38 deletions(-) diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py index 58b6db139f5..b3d5935784f 100644 --- a/homeassistant/components/camera/__init__.py +++ b/homeassistant/components/camera/__init__.py @@ -4,55 +4,54 @@ import base64 import collections from contextlib import suppress from datetime import timedelta -import logging import hashlib +import logging from random import SystemRandom -import attr from aiohttp import web import async_timeout +import attr import voluptuous as vol -from homeassistant.core import callback +from homeassistant.components import websocket_api +from homeassistant.components.http import KEY_AUTHENTICATED, HomeAssistantView +from homeassistant.components.media_player.const import ( + ATTR_MEDIA_CONTENT_ID, + ATTR_MEDIA_CONTENT_TYPE, + DOMAIN as DOMAIN_MP, + SERVICE_PLAY_MEDIA, +) +from homeassistant.components.stream import request_stream +from homeassistant.components.stream.const import ( + CONF_DURATION, + CONF_LOOKBACK, + CONF_STREAM_SOURCE, + DOMAIN as DOMAIN_STREAM, + FORMAT_CONTENT_TYPE, + OUTPUT_FORMATS, + SERVICE_RECORD, +) from homeassistant.const import ( ATTR_ENTITY_ID, + CONF_FILENAME, SERVICE_TURN_OFF, SERVICE_TURN_ON, - CONF_FILENAME, ) +from homeassistant.core import callback from homeassistant.exceptions import HomeAssistantError -from homeassistant.loader import bind_hass -from homeassistant.helpers.entity import Entity -from homeassistant.helpers.entity_component import EntityComponent +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.config_validation import ( # noqa: F401 PLATFORM_SCHEMA, PLATFORM_SCHEMA_BASE, ) -from homeassistant.components.http import HomeAssistantView, KEY_AUTHENTICATED -from homeassistant.components.media_player.const import ( - ATTR_MEDIA_CONTENT_ID, - ATTR_MEDIA_CONTENT_TYPE, - SERVICE_PLAY_MEDIA, - DOMAIN as DOMAIN_MP, -) -from homeassistant.components.stream import request_stream -from homeassistant.components.stream.const import ( - OUTPUT_FORMATS, - FORMAT_CONTENT_TYPE, - CONF_STREAM_SOURCE, - CONF_LOOKBACK, - CONF_DURATION, - SERVICE_RECORD, - DOMAIN as DOMAIN_STREAM, -) -from homeassistant.components import websocket_api -import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.entity import Entity +from homeassistant.helpers.entity_component import EntityComponent +from homeassistant.loader import bind_hass from homeassistant.setup import async_when_setup -from .const import DOMAIN, DATA_CAMERA_PREFS +from .const import DATA_CAMERA_PREFS, DOMAIN from .prefs import CameraPreferences - # mypy: allow-untyped-calls, allow-untyped-defs _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/camera/prefs.py b/homeassistant/components/camera/prefs.py index d83e0b55c96..ae182c62dc6 100644 --- a/homeassistant/components/camera/prefs.py +++ b/homeassistant/components/camera/prefs.py @@ -1,7 +1,6 @@ """Preference management for camera component.""" from .const import DOMAIN, PREF_PRELOAD_STREAM - # mypy: allow-untyped-defs, no-check-untyped-defs STORAGE_KEY = DOMAIN diff --git a/tests/components/camera/common.py b/tests/components/camera/common.py index 971d723d2d5..8c05295b5d1 100644 --- a/tests/components/camera/common.py +++ b/tests/components/camera/common.py @@ -9,15 +9,15 @@ from homeassistant.components.camera import ( SERVICE_SNAPSHOT, ) from homeassistant.components.camera.const import ( - DOMAIN, DATA_CAMERA_PREFS, + DOMAIN, PREF_PRELOAD_STREAM, ) from homeassistant.const import ( ATTR_ENTITY_ID, + ENTITY_MATCH_ALL, SERVICE_TURN_OFF, SERVICE_TURN_ON, - ENTITY_MATCH_ALL, ) from homeassistant.core import callback from homeassistant.loader import bind_hass diff --git a/tests/components/camera/test_init.py b/tests/components/camera/test_init.py index 17bcaadb92b..89a19d0458a 100644 --- a/tests/components/camera/test_init.py +++ b/tests/components/camera/test_init.py @@ -2,26 +2,26 @@ import asyncio import base64 import io -from unittest.mock import patch, mock_open, PropertyMock +from unittest.mock import PropertyMock, mock_open, patch import pytest -from homeassistant.setup import setup_component, async_setup_component +from homeassistant.components import camera, http +from homeassistant.components.camera.const import DOMAIN, PREF_PRELOAD_STREAM +from homeassistant.components.camera.prefs import CameraEntityPreferences +from homeassistant.components.websocket_api.const import TYPE_RESULT from homeassistant.const import ( ATTR_ENTITY_ID, ATTR_ENTITY_PICTURE, EVENT_HOMEASSISTANT_START, ) -from homeassistant.components import camera, http -from homeassistant.components.camera.const import DOMAIN, PREF_PRELOAD_STREAM -from homeassistant.components.camera.prefs import CameraEntityPreferences -from homeassistant.components.websocket_api.const import TYPE_RESULT from homeassistant.exceptions import HomeAssistantError +from homeassistant.setup import async_setup_component, setup_component from tests.common import ( + assert_setup_component, get_test_home_assistant, get_test_instance_port, - assert_setup_component, mock_coro, ) from tests.components.camera import common