From 5cdaff5405e3dbac64a1d2b52ae54180bdd9801a Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 9 Dec 2019 14:26:53 +0100 Subject: [PATCH] Sort imports according to PEP8 for components starting with "O" (#29774) --- homeassistant/components/obihai/sensor.py | 9 +++------ homeassistant/components/octoprint/__init__.py | 12 ++++++------ homeassistant/components/onewire/sensor.py | 8 ++++---- homeassistant/components/onkyo/media_player.py | 8 ++++---- .../openalpr_cloud/image_processing.py | 12 ++++++------ .../openalpr_local/image_processing.py | 16 ++++++++-------- .../components/openexchangerates/sensor.py | 8 ++++---- homeassistant/components/opengarage/cover.py | 10 +++++----- homeassistant/components/opensky/sensor.py | 15 +++++++-------- homeassistant/components/oru/sensor.py | 6 ++---- tests/components/onboarding/test_init.py | 8 ++++---- tests/components/onboarding/test_views.py | 6 +++--- .../openalpr_cloud/test_image_processing.py | 8 ++++---- .../openalpr_local/test_image_processing.py | 10 +++++----- .../openhardwaremonitor/test_sensor.py | 5 ++++- tests/components/openuv/test_config_flow.py | 5 +++-- 16 files changed, 72 insertions(+), 74 deletions(-) diff --git a/homeassistant/components/obihai/sensor.py b/homeassistant/components/obihai/sensor.py index 89bfee7d4ee..13d09de0542 100644 --- a/homeassistant/components/obihai/sensor.py +++ b/homeassistant/components/obihai/sensor.py @@ -1,10 +1,9 @@ """Support for Obihai Sensors.""" +from datetime import timedelta import logging -from datetime import timedelta -import voluptuous as vol - from pyobihai import PyObihai +import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( @@ -13,10 +12,8 @@ from homeassistant.const import ( CONF_USERNAME, DEVICE_CLASS_TIMESTAMP, ) - -from homeassistant.helpers.entity import Entity import homeassistant.helpers.config_validation as cv - +from homeassistant.helpers.entity import Entity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/octoprint/__init__.py b/homeassistant/components/octoprint/__init__.py index bc71b1a5911..7564330e499 100644 --- a/homeassistant/components/octoprint/__init__.py +++ b/homeassistant/components/octoprint/__init__.py @@ -2,23 +2,23 @@ import logging import time +from aiohttp.hdrs import CONTENT_TYPE import requests import voluptuous as vol -from aiohttp.hdrs import CONTENT_TYPE from homeassistant.components.discovery import SERVICE_OCTOPRINT from homeassistant.const import ( CONF_API_KEY, + CONF_BINARY_SENSORS, CONF_HOST, - CONTENT_TYPE_JSON, + CONF_MONITORED_CONDITIONS, CONF_NAME, CONF_PATH, CONF_PORT, - CONF_SSL, - TEMP_CELSIUS, - CONF_MONITORED_CONDITIONS, CONF_SENSORS, - CONF_BINARY_SENSORS, + CONF_SSL, + CONTENT_TYPE_JSON, + TEMP_CELSIUS, ) from homeassistant.helpers import discovery import homeassistant.helpers.config_validation as cv diff --git a/homeassistant/components/onewire/sensor.py b/homeassistant/components/onewire/sensor.py index e0a47a45b25..6e90178c5d3 100644 --- a/homeassistant/components/onewire/sensor.py +++ b/homeassistant/components/onewire/sensor.py @@ -1,15 +1,15 @@ """Support for 1-Wire environment sensors.""" +from glob import glob +import logging import os import time -import logging -from glob import glob import voluptuous as vol +from homeassistant.components.sensor import PLATFORM_SCHEMA +from homeassistant.const import TEMP_CELSIUS import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity -from homeassistant.const import TEMP_CELSIUS -from homeassistant.components.sensor import PLATFORM_SCHEMA _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/onkyo/media_player.py b/homeassistant/components/onkyo/media_player.py index 86f0f418c3f..93107b2eb48 100644 --- a/homeassistant/components/onkyo/media_player.py +++ b/homeassistant/components/onkyo/media_player.py @@ -2,12 +2,13 @@ import logging from typing import List -import voluptuous as vol import eiscp from eiscp import eISCP +import voluptuous as vol -from homeassistant.components.media_player import MediaPlayerDevice, PLATFORM_SCHEMA +from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerDevice from homeassistant.components.media_player.const import ( + DOMAIN, SUPPORT_PLAY, SUPPORT_PLAY_MEDIA, SUPPORT_SELECT_SOURCE, @@ -16,14 +17,13 @@ from homeassistant.components.media_player.const import ( SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, SUPPORT_VOLUME_STEP, - DOMAIN, ) from homeassistant.const import ( + ATTR_ENTITY_ID, CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON, - ATTR_ENTITY_ID, ) import homeassistant.helpers.config_validation as cv diff --git a/homeassistant/components/openalpr_cloud/image_processing.py b/homeassistant/components/openalpr_cloud/image_processing.py index 66081d9b271..64ba0d83844 100644 --- a/homeassistant/components/openalpr_cloud/image_processing.py +++ b/homeassistant/components/openalpr_cloud/image_processing.py @@ -1,26 +1,26 @@ """Component that will help set the OpenALPR cloud for ALPR processing.""" import asyncio -import logging from base64 import b64encode +import logging import aiohttp import async_timeout import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.core import split_entity_id -from homeassistant.const import CONF_API_KEY from homeassistant.components.image_processing import ( - PLATFORM_SCHEMA, CONF_CONFIDENCE, - CONF_SOURCE, CONF_ENTITY_ID, CONF_NAME, + CONF_SOURCE, + PLATFORM_SCHEMA, ) from homeassistant.components.openalpr_local.image_processing import ( ImageProcessingAlprEntity, ) +from homeassistant.const import CONF_API_KEY +from homeassistant.core import split_entity_id from homeassistant.helpers.aiohttp_client import async_get_clientsession +import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/openalpr_local/image_processing.py b/homeassistant/components/openalpr_local/image_processing.py index 32a08b53165..df7b235a224 100644 --- a/homeassistant/components/openalpr_local/image_processing.py +++ b/homeassistant/components/openalpr_local/image_processing.py @@ -6,19 +6,19 @@ import re import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.core import split_entity_id, callback -from homeassistant.const import CONF_REGION from homeassistant.components.image_processing import ( - PLATFORM_SCHEMA, - ImageProcessingEntity, + ATTR_CONFIDENCE, + ATTR_ENTITY_ID, CONF_CONFIDENCE, - CONF_SOURCE, CONF_ENTITY_ID, CONF_NAME, - ATTR_ENTITY_ID, - ATTR_CONFIDENCE, + CONF_SOURCE, + PLATFORM_SCHEMA, + ImageProcessingEntity, ) +from homeassistant.const import CONF_REGION +from homeassistant.core import callback, split_entity_id +import homeassistant.helpers.config_validation as cv from homeassistant.util.async_ import run_callback_threadsafe _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/openexchangerates/sensor.py b/homeassistant/components/openexchangerates/sensor.py index 9b79eb564e0..cc6da709dff 100644 --- a/homeassistant/components/openexchangerates/sensor.py +++ b/homeassistant/components/openexchangerates/sensor.py @@ -7,11 +7,11 @@ import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - CONF_API_KEY, - CONF_NAME, - CONF_BASE, - CONF_QUOTE, ATTR_ATTRIBUTION, + CONF_API_KEY, + CONF_BASE, + CONF_NAME, + CONF_QUOTE, ) import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity diff --git a/homeassistant/components/opengarage/cover.py b/homeassistant/components/opengarage/cover.py index 6b5cbc912e6..26a69fa11af 100644 --- a/homeassistant/components/opengarage/cover.py +++ b/homeassistant/components/opengarage/cover.py @@ -5,22 +5,22 @@ import requests import voluptuous as vol from homeassistant.components.cover import ( - CoverDevice, DEVICE_CLASS_GARAGE, PLATFORM_SCHEMA, - SUPPORT_OPEN, SUPPORT_CLOSE, + SUPPORT_OPEN, + CoverDevice, ) from homeassistant.const import ( - CONF_NAME, - STATE_CLOSED, - STATE_OPEN, CONF_COVERS, CONF_HOST, + CONF_NAME, CONF_PORT, CONF_SSL, CONF_VERIFY_SSL, + STATE_CLOSED, STATE_CLOSING, + STATE_OPEN, STATE_OPENING, ) import homeassistant.helpers.config_validation as cv diff --git a/homeassistant/components/opensky/sensor.py b/homeassistant/components/opensky/sensor.py index 0c17daa0ab4..cef99902d23 100644 --- a/homeassistant/components/opensky/sensor.py +++ b/homeassistant/components/opensky/sensor.py @@ -1,26 +1,25 @@ """Sensor for the Open Sky Network.""" -import logging from datetime import timedelta +import logging import requests import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - CONF_NAME, - CONF_LATITUDE, - CONF_LONGITUDE, - CONF_RADIUS, ATTR_ATTRIBUTION, ATTR_LATITUDE, ATTR_LONGITUDE, + CONF_LATITUDE, + CONF_LONGITUDE, + CONF_NAME, + CONF_RADIUS, LENGTH_KILOMETERS, LENGTH_METERS, ) +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity -from homeassistant.util import distance as util_distance -from homeassistant.util import location as util_location +from homeassistant.util import distance as util_distance, location as util_location _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/oru/sensor.py b/homeassistant/components/oru/sensor.py index e68d8e1c45a..32eb5b7569b 100644 --- a/homeassistant/components/oru/sensor.py +++ b/homeassistant/components/oru/sensor.py @@ -2,14 +2,12 @@ from datetime import timedelta import logging +from oru import Meter, MeterError import voluptuous as vol -from oru import Meter -from oru import MeterError - from homeassistant.components.sensor import PLATFORM_SCHEMA -import homeassistant.helpers.config_validation as cv from homeassistant.const import ENERGY_KILO_WATT_HOUR +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/onboarding/test_init.py b/tests/components/onboarding/test_init.py index a7fc1ad43f4..e347a07e73f 100644 --- a/tests/components/onboarding/test_init.py +++ b/tests/components/onboarding/test_init.py @@ -1,13 +1,13 @@ """Tests for the init.""" -from unittest.mock import patch, Mock +from unittest.mock import Mock, patch -from homeassistant.setup import async_setup_component from homeassistant.components import onboarding - -from tests.common import mock_coro, MockUser +from homeassistant.setup import async_setup_component from . import mock_storage +from tests.common import MockUser, mock_coro + # Temporarily: if auth not active, always set onboarded=True diff --git a/tests/components/onboarding/test_views.py b/tests/components/onboarding/test_views.py index 7881b75ee99..6d2c6e4c08f 100644 --- a/tests/components/onboarding/test_views.py +++ b/tests/components/onboarding/test_views.py @@ -4,15 +4,15 @@ from unittest.mock import patch import pytest -from homeassistant.setup import async_setup_component from homeassistant.components import onboarding from homeassistant.components.onboarding import const, views +from homeassistant.setup import async_setup_component + +from . import mock_storage from tests.common import CLIENT_ID, register_auth_provider from tests.components.met.conftest import mock_weather # noqa: F401 -from . import mock_storage - @pytest.fixture(autouse=True) def always_mock_weather(mock_weather): # noqa: F811 diff --git a/tests/components/openalpr_cloud/test_image_processing.py b/tests/components/openalpr_cloud/test_image_processing.py index e559b6adc45..4aec9e68709 100644 --- a/tests/components/openalpr_cloud/test_image_processing.py +++ b/tests/components/openalpr_cloud/test_image_processing.py @@ -1,15 +1,15 @@ """The tests for the openalpr cloud platform.""" import asyncio -from unittest.mock import patch, PropertyMock +from unittest.mock import PropertyMock, patch -from homeassistant.core import callback -from homeassistant.setup import setup_component from homeassistant.components import camera, image_processing as ip from homeassistant.components.openalpr_cloud.image_processing import OPENALPR_API_URL +from homeassistant.core import callback +from homeassistant.setup import setup_component from tests.common import ( - get_test_home_assistant, assert_setup_component, + get_test_home_assistant, load_fixture, mock_coro, ) diff --git a/tests/components/openalpr_local/test_image_processing.py b/tests/components/openalpr_local/test_image_processing.py index bc29c227b0c..4c34abca1d4 100644 --- a/tests/components/openalpr_local/test_image_processing.py +++ b/tests/components/openalpr_local/test_image_processing.py @@ -1,13 +1,13 @@ """The tests for the openalpr local platform.""" import asyncio -from unittest.mock import patch, PropertyMock, MagicMock +from unittest.mock import MagicMock, PropertyMock, patch -from homeassistant.core import callback -from homeassistant.const import ATTR_ENTITY_PICTURE -from homeassistant.setup import setup_component import homeassistant.components.image_processing as ip +from homeassistant.const import ATTR_ENTITY_PICTURE +from homeassistant.core import callback +from homeassistant.setup import setup_component -from tests.common import get_test_home_assistant, assert_setup_component, load_fixture +from tests.common import assert_setup_component, get_test_home_assistant, load_fixture from tests.components.image_processing import common diff --git a/tests/components/openhardwaremonitor/test_sensor.py b/tests/components/openhardwaremonitor/test_sensor.py index 909f9ab2732..3fb93cb1375 100644 --- a/tests/components/openhardwaremonitor/test_sensor.py +++ b/tests/components/openhardwaremonitor/test_sensor.py @@ -1,8 +1,11 @@ """The tests for the Open Hardware Monitor platform.""" import unittest + import requests_mock + from homeassistant.setup import setup_component -from tests.common import load_fixture, get_test_home_assistant + +from tests.common import get_test_home_assistant, load_fixture class TestOpenHardwareMonitorSetup(unittest.TestCase): diff --git a/tests/components/openuv/test_config_flow.py b/tests/components/openuv/test_config_flow.py index 43dd5924a72..3aa67abdc4f 100644 --- a/tests/components/openuv/test_config_flow.py +++ b/tests/components/openuv/test_config_flow.py @@ -1,8 +1,9 @@ """Define tests for the OpenUV config flow.""" -import pytest -from pyopenuv.errors import OpenUvError from unittest.mock import patch +from pyopenuv.errors import OpenUvError +import pytest + from homeassistant import data_entry_flow from homeassistant.components.openuv import DOMAIN, config_flow from homeassistant.const import (