Sort imports according to PEP8 for camera (#29691)

This commit is contained in:
Bas Nijholt 2019-12-09 11:50:48 +01:00 committed by Franck Nijhof
parent 0b4ca9ecac
commit 4c5c34919d
4 changed files with 36 additions and 38 deletions

View file

@ -4,55 +4,54 @@ import base64
import collections import collections
from contextlib import suppress from contextlib import suppress
from datetime import timedelta from datetime import timedelta
import logging
import hashlib import hashlib
import logging
from random import SystemRandom from random import SystemRandom
import attr
from aiohttp import web from aiohttp import web
import async_timeout import async_timeout
import attr
import voluptuous as vol 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 ( from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_ENTITY_ID,
CONF_FILENAME,
SERVICE_TURN_OFF, SERVICE_TURN_OFF,
SERVICE_TURN_ON, SERVICE_TURN_ON,
CONF_FILENAME,
) )
from homeassistant.core import callback
from homeassistant.exceptions import HomeAssistantError from homeassistant.exceptions import HomeAssistantError
from homeassistant.loader import bind_hass import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import Entity
from homeassistant.helpers.entity_component import EntityComponent
from homeassistant.helpers.config_validation import ( # noqa: F401 from homeassistant.helpers.config_validation import ( # noqa: F401
PLATFORM_SCHEMA, PLATFORM_SCHEMA,
PLATFORM_SCHEMA_BASE, PLATFORM_SCHEMA_BASE,
) )
from homeassistant.components.http import HomeAssistantView, KEY_AUTHENTICATED from homeassistant.helpers.entity import Entity
from homeassistant.components.media_player.const import ( from homeassistant.helpers.entity_component import EntityComponent
ATTR_MEDIA_CONTENT_ID, from homeassistant.loader import bind_hass
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.setup import async_when_setup 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 from .prefs import CameraPreferences
# mypy: allow-untyped-calls, allow-untyped-defs # mypy: allow-untyped-calls, allow-untyped-defs
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)

View file

@ -1,7 +1,6 @@
"""Preference management for camera component.""" """Preference management for camera component."""
from .const import DOMAIN, PREF_PRELOAD_STREAM from .const import DOMAIN, PREF_PRELOAD_STREAM
# mypy: allow-untyped-defs, no-check-untyped-defs # mypy: allow-untyped-defs, no-check-untyped-defs
STORAGE_KEY = DOMAIN STORAGE_KEY = DOMAIN

View file

@ -9,15 +9,15 @@ from homeassistant.components.camera import (
SERVICE_SNAPSHOT, SERVICE_SNAPSHOT,
) )
from homeassistant.components.camera.const import ( from homeassistant.components.camera.const import (
DOMAIN,
DATA_CAMERA_PREFS, DATA_CAMERA_PREFS,
DOMAIN,
PREF_PRELOAD_STREAM, PREF_PRELOAD_STREAM,
) )
from homeassistant.const import ( from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_ENTITY_ID,
ENTITY_MATCH_ALL,
SERVICE_TURN_OFF, SERVICE_TURN_OFF,
SERVICE_TURN_ON, SERVICE_TURN_ON,
ENTITY_MATCH_ALL,
) )
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.loader import bind_hass from homeassistant.loader import bind_hass

View file

@ -2,26 +2,26 @@
import asyncio import asyncio
import base64 import base64
import io import io
from unittest.mock import patch, mock_open, PropertyMock from unittest.mock import PropertyMock, mock_open, patch
import pytest 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 ( from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_ENTITY_ID,
ATTR_ENTITY_PICTURE, ATTR_ENTITY_PICTURE,
EVENT_HOMEASSISTANT_START, 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.exceptions import HomeAssistantError
from homeassistant.setup import async_setup_component, setup_component
from tests.common import ( from tests.common import (
assert_setup_component,
get_test_home_assistant, get_test_home_assistant,
get_test_instance_port, get_test_instance_port,
assert_setup_component,
mock_coro, mock_coro,
) )
from tests.components.camera import common from tests.components.camera import common