From eb47c2b1487f0e99a577b41532b0ffd3501d1edc Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 9 Dec 2019 12:17:41 +0100 Subject: [PATCH] Sort imports according to PEP8 for media_player (#29665) --- .../components/media_player/__init__.py | 1 - .../components/media_player/device_condition.py | 10 ++++++---- .../components/media_player/reproduce_state.py | 17 ++++++++--------- tests/components/media_player/common.py | 2 +- .../media_player/test_async_helpers.py | 10 +++++----- .../media_player/test_device_condition.py | 10 +++++----- tests/components/media_player/test_init.py | 2 +- .../media_player/test_reproduce_state.py | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py index a6cd4dda4ea..1375a0ed429 100644 --- a/homeassistant/components/media_player/__init__.py +++ b/homeassistant/components/media_player/__init__.py @@ -97,7 +97,6 @@ from .const import ( SUPPORT_VOLUME_STEP, ) - # mypy: allow-untyped-defs, no-check-untyped-defs _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/media_player/device_condition.py b/homeassistant/components/media_player/device_condition.py index a67a084a94f..a8091a6aed8 100644 --- a/homeassistant/components/media_player/device_condition.py +++ b/homeassistant/components/media_player/device_condition.py @@ -1,24 +1,26 @@ """Provides device automations for Media player.""" from typing import Dict, List + import voluptuous as vol from homeassistant.const import ( ATTR_ENTITY_ID, CONF_CONDITION, - CONF_DOMAIN, - CONF_TYPE, CONF_DEVICE_ID, + CONF_DOMAIN, CONF_ENTITY_ID, + CONF_TYPE, + STATE_IDLE, STATE_OFF, STATE_ON, - STATE_IDLE, STATE_PAUSED, STATE_PLAYING, ) from homeassistant.core import HomeAssistant from homeassistant.helpers import condition, config_validation as cv, entity_registry -from homeassistant.helpers.typing import ConfigType, TemplateVarsType from homeassistant.helpers.config_validation import DEVICE_CONDITION_BASE_SCHEMA +from homeassistant.helpers.typing import ConfigType, TemplateVarsType + from . import DOMAIN CONDITION_TYPES = {"is_on", "is_off", "is_idle", "is_paused", "is_playing"} diff --git a/homeassistant/components/media_player/reproduce_state.py b/homeassistant/components/media_player/reproduce_state.py index dac08afe471..dc9078d3ffd 100644 --- a/homeassistant/components/media_player/reproduce_state.py +++ b/homeassistant/components/media_player/reproduce_state.py @@ -21,21 +21,20 @@ from homeassistant.core import Context, State from homeassistant.helpers.typing import HomeAssistantType from .const import ( + ATTR_INPUT_SOURCE, + ATTR_MEDIA_CONTENT_ID, + ATTR_MEDIA_CONTENT_TYPE, + ATTR_MEDIA_ENQUEUE, + ATTR_MEDIA_SEEK_POSITION, ATTR_MEDIA_VOLUME_LEVEL, ATTR_MEDIA_VOLUME_MUTED, - ATTR_MEDIA_SEEK_POSITION, - ATTR_INPUT_SOURCE, ATTR_SOUND_MODE, - ATTR_MEDIA_CONTENT_TYPE, - ATTR_MEDIA_CONTENT_ID, - ATTR_MEDIA_ENQUEUE, - SERVICE_PLAY_MEDIA, - SERVICE_SELECT_SOURCE, - SERVICE_SELECT_SOUND_MODE, DOMAIN, + SERVICE_PLAY_MEDIA, + SERVICE_SELECT_SOUND_MODE, + SERVICE_SELECT_SOURCE, ) - # mypy: allow-untyped-defs diff --git a/tests/components/media_player/common.py b/tests/components/media_player/common.py index 177f8169ff9..5be9a292829 100644 --- a/tests/components/media_player/common.py +++ b/tests/components/media_player/common.py @@ -18,6 +18,7 @@ from homeassistant.components.media_player.const import ( ) from homeassistant.const import ( ATTR_ENTITY_ID, + ENTITY_MATCH_ALL, SERVICE_MEDIA_NEXT_TRACK, SERVICE_MEDIA_PAUSE, SERVICE_MEDIA_PLAY, @@ -32,7 +33,6 @@ from homeassistant.const import ( SERVICE_VOLUME_MUTE, SERVICE_VOLUME_SET, SERVICE_VOLUME_UP, - ENTITY_MATCH_ALL, ) from homeassistant.loader import bind_hass diff --git a/tests/components/media_player/test_async_helpers.py b/tests/components/media_player/test_async_helpers.py index 4a2e4fed6c5..2e1ded3f084 100644 --- a/tests/components/media_player/test_async_helpers.py +++ b/tests/components/media_player/test_async_helpers.py @@ -1,14 +1,14 @@ """The tests for the Async Media player helper functions.""" -import unittest import asyncio +import unittest import homeassistant.components.media_player as mp from homeassistant.const import ( - STATE_PLAYING, - STATE_PAUSED, - STATE_ON, - STATE_OFF, STATE_IDLE, + STATE_OFF, + STATE_ON, + STATE_PAUSED, + STATE_PLAYING, ) from tests.common import get_test_home_assistant diff --git a/tests/components/media_player/test_device_condition.py b/tests/components/media_player/test_device_condition.py index 6216cc0e2b0..333cc4a2b13 100644 --- a/tests/components/media_player/test_device_condition.py +++ b/tests/components/media_player/test_device_condition.py @@ -1,25 +1,25 @@ """The tests for Media player device conditions.""" import pytest +import homeassistant.components.automation as automation from homeassistant.components.media_player import DOMAIN from homeassistant.const import ( - STATE_ON, - STATE_OFF, STATE_IDLE, + STATE_OFF, + STATE_ON, STATE_PAUSED, STATE_PLAYING, ) -from homeassistant.setup import async_setup_component -import homeassistant.components.automation as automation from homeassistant.helpers import device_registry +from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, assert_lists_same, + async_get_device_automations, async_mock_service, mock_device_registry, mock_registry, - async_get_device_automations, ) diff --git a/tests/components/media_player/test_init.py b/tests/components/media_player/test_init.py index 7e36206a635..3db92cda42d 100644 --- a/tests/components/media_player/test_init.py +++ b/tests/components/media_player/test_init.py @@ -2,8 +2,8 @@ import base64 from unittest.mock import patch -from homeassistant.setup import async_setup_component from homeassistant.components.websocket_api.const import TYPE_RESULT +from homeassistant.setup import async_setup_component from tests.common import mock_coro diff --git a/tests/components/media_player/test_reproduce_state.py b/tests/components/media_player/test_reproduce_state.py index ddc5d6cf0ca..cbc5684f5d5 100644 --- a/tests/components/media_player/test_reproduce_state.py +++ b/tests/components/media_player/test_reproduce_state.py @@ -2,7 +2,6 @@ import pytest -from homeassistant.components.media_player.reproduce_state import async_reproduce_states from homeassistant.components.media_player.const import ( ATTR_INPUT_SOURCE, ATTR_MEDIA_CONTENT_ID, @@ -17,6 +16,7 @@ from homeassistant.components.media_player.const import ( SERVICE_SELECT_SOUND_MODE, SERVICE_SELECT_SOURCE, ) +from homeassistant.components.media_player.reproduce_state import async_reproduce_states from homeassistant.const import ( SERVICE_MEDIA_PAUSE, SERVICE_MEDIA_PLAY,