From e4e4f78eb0aec339a030d65fbbe59ae346a82ba8 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 9 Dec 2019 11:54:56 +0100 Subject: [PATCH] Sort imports according to PEP8 for utility_meter (#29710) --- .../components/utility_meter/__init__.py | 37 ++++++++++--------- .../components/utility_meter/sensor.py | 35 +++++++++--------- tests/components/utility_meter/test_init.py | 15 ++++---- tests/components/utility_meter/test_sensor.py | 20 +++++----- 4 files changed, 54 insertions(+), 53 deletions(-) diff --git a/homeassistant/components/utility_meter/__init__.py b/homeassistant/components/utility_meter/__init__.py index 04e472a7828..ef9d9b1ddce 100644 --- a/homeassistant/components/utility_meter/__init__.py +++ b/homeassistant/components/utility_meter/__init__.py @@ -1,33 +1,34 @@ """Support for tracking consumption over given periods of time.""" -import logging from datetime import timedelta +import logging import voluptuous as vol +from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.const import CONF_NAME -import homeassistant.helpers.config_validation as cv from homeassistant.helpers import discovery +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.entity_component import EntityComponent from homeassistant.helpers.restore_state import RestoreEntity -from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN + from .const import ( - DOMAIN, - SIGNAL_RESET_METER, - METER_TYPES, - CONF_METER_TYPE, - CONF_METER_OFFSET, - CONF_METER_NET_CONSUMPTION, - CONF_SOURCE_SENSOR, - CONF_TARIFF_ENTITY, - CONF_TARIFF, - CONF_TARIFFS, - CONF_METER, - DATA_UTILITY, - SERVICE_RESET, - SERVICE_SELECT_TARIFF, - SERVICE_SELECT_NEXT_TARIFF, ATTR_TARIFF, + CONF_METER, + CONF_METER_NET_CONSUMPTION, + CONF_METER_OFFSET, + CONF_METER_TYPE, + CONF_SOURCE_SENSOR, + CONF_TARIFF, + CONF_TARIFF_ENTITY, + CONF_TARIFFS, + DATA_UTILITY, + DOMAIN, + METER_TYPES, + SERVICE_RESET, + SERVICE_SELECT_NEXT_TARIFF, + SERVICE_SELECT_TARIFF, + SIGNAL_RESET_METER, ) _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/utility_meter/sensor.py b/homeassistant/components/utility_meter/sensor.py index 41fe2cbcc0a..3dab92b89f8 100644 --- a/homeassistant/components/utility_meter/sensor.py +++ b/homeassistant/components/utility_meter/sensor.py @@ -1,39 +1,40 @@ """Utility meter from sensors providing raw data.""" -import logging from datetime import date, timedelta from decimal import Decimal, DecimalException +import logging -import homeassistant.util.dt as dt_util from homeassistant.const import ( - CONF_NAME, ATTR_UNIT_OF_MEASUREMENT, + CONF_NAME, EVENT_HOMEASSISTANT_START, - STATE_UNKNOWN, STATE_UNAVAILABLE, + STATE_UNKNOWN, ) from homeassistant.core import callback +from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.event import ( async_track_state_change, async_track_time_change, ) -from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.restore_state import RestoreEntity +import homeassistant.util.dt as dt_util + from .const import ( - DATA_UTILITY, - SIGNAL_RESET_METER, - HOURLY, - DAILY, - WEEKLY, - MONTHLY, - QUARTERLY, - YEARLY, - CONF_SOURCE_SENSOR, - CONF_METER_TYPE, - CONF_METER_OFFSET, + CONF_METER, CONF_METER_NET_CONSUMPTION, + CONF_METER_OFFSET, + CONF_METER_TYPE, + CONF_SOURCE_SENSOR, CONF_TARIFF, CONF_TARIFF_ENTITY, - CONF_METER, + DAILY, + DATA_UTILITY, + HOURLY, + MONTHLY, + QUARTERLY, + SIGNAL_RESET_METER, + WEEKLY, + YEARLY, ) _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/utility_meter/test_init.py b/tests/components/utility_meter/test_init.py index 784a3647b8d..719ea9445cc 100644 --- a/tests/components/utility_meter/test_init.py +++ b/tests/components/utility_meter/test_init.py @@ -1,20 +1,19 @@ """The tests for the utility_meter component.""" -import logging - from datetime import timedelta +import logging from unittest.mock import patch -from homeassistant.const import EVENT_HOMEASSISTANT_START, ATTR_ENTITY_ID +from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.components.utility_meter.const import ( - SERVICE_RESET, - SERVICE_SELECT_TARIFF, - SERVICE_SELECT_NEXT_TARIFF, ATTR_TARIFF, + DOMAIN, + SERVICE_RESET, + SERVICE_SELECT_NEXT_TARIFF, + SERVICE_SELECT_TARIFF, ) +from homeassistant.const import ATTR_ENTITY_ID, EVENT_HOMEASSISTANT_START from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from homeassistant.components.utility_meter.const import DOMAIN -from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/utility_meter/test_sensor.py b/tests/components/utility_meter/test_sensor.py index 7bf10875b77..fcfe97804e4 100644 --- a/tests/components/utility_meter/test_sensor.py +++ b/tests/components/utility_meter/test_sensor.py @@ -1,20 +1,20 @@ """The tests for the utility_meter sensor platform.""" -import logging - -from datetime import timedelta -from unittest.mock import patch from contextlib import contextmanager +from datetime import timedelta +import logging +from unittest.mock import patch -from tests.common import async_fire_time_changed -from homeassistant.const import EVENT_HOMEASSISTANT_START, ATTR_ENTITY_ID -from homeassistant.setup import async_setup_component -import homeassistant.util.dt as dt_util +from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.components.utility_meter.const import ( + ATTR_TARIFF, DOMAIN, SERVICE_SELECT_TARIFF, - ATTR_TARIFF, ) -from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN +from homeassistant.const import ATTR_ENTITY_ID, EVENT_HOMEASSISTANT_START +from homeassistant.setup import async_setup_component +import homeassistant.util.dt as dt_util + +from tests.common import async_fire_time_changed _LOGGER = logging.getLogger(__name__)