From d58e6e924a271fa446f6267d598ad18269e7d164 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 9 Dec 2019 14:17:36 +0100 Subject: [PATCH] Sort imports according to PEP8 for components starting with "G" (#29767) --- homeassistant/components/garadget/cover.py | 14 +++++------ homeassistant/components/geizhals/sensor.py | 8 +++---- homeassistant/components/generic/camera.py | 24 +++++++++---------- .../components/generic_thermostat/climate.py | 2 +- homeassistant/components/geniushub/switch.py | 2 +- .../components/geo_location/__init__.py | 1 - .../components/geo_rss_events/sensor.py | 10 ++++---- homeassistant/components/github/sensor.py | 1 + homeassistant/components/google/__init__.py | 13 +++++----- homeassistant/components/google_cloud/tts.py | 4 ++-- .../components/google_domains/__init__.py | 2 +- .../components/google_wifi/sensor.py | 11 ++++----- homeassistant/components/graphite/__init__.py | 2 +- .../components/growatt_server/sensor.py | 12 +++++----- tests/components/generic/test_camera.py | 1 - .../geo_json_events/test_geo_location.py | 17 ++++++------- .../components/geo_rss_events/test_sensor.py | 11 +++++---- tests/components/google/test_calendar.py | 1 - tests/components/google_domains/test_init.py | 2 +- tests/components/google_translate/test_tts.py | 7 +++--- tests/components/google_wifi/test_sensor.py | 8 +++---- tests/components/graphite/test_init.py | 9 +++---- 22 files changed, 80 insertions(+), 82 deletions(-) diff --git a/homeassistant/components/garadget/cover.py b/homeassistant/components/garadget/cover.py index d487c39db6b..0eeb5f2b8f9 100644 --- a/homeassistant/components/garadget/cover.py +++ b/homeassistant/components/garadget/cover.py @@ -4,19 +4,19 @@ import logging import requests import voluptuous as vol -import homeassistant.helpers.config_validation as cv -from homeassistant.components.cover import CoverDevice, PLATFORM_SCHEMA -from homeassistant.helpers.event import track_utc_time_change +from homeassistant.components.cover import PLATFORM_SCHEMA, CoverDevice from homeassistant.const import ( - CONF_DEVICE, - CONF_USERNAME, - CONF_PASSWORD, CONF_ACCESS_TOKEN, + CONF_COVERS, + CONF_DEVICE, CONF_NAME, + CONF_PASSWORD, + CONF_USERNAME, STATE_CLOSED, STATE_OPEN, - CONF_COVERS, ) +import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.event import track_utc_time_change _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/geizhals/sensor.py b/homeassistant/components/geizhals/sensor.py index f04e943964c..9d5605cc404 100644 --- a/homeassistant/components/geizhals/sensor.py +++ b/homeassistant/components/geizhals/sensor.py @@ -1,15 +1,15 @@ """Parse prices of a device from geizhals.""" -import logging from datetime import timedelta +import logging from geizhals import Device, Geizhals import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA -import homeassistant.helpers.config_validation as cv -from homeassistant.util import Throttle -from homeassistant.helpers.entity import Entity from homeassistant.const import CONF_NAME +import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.entity import Entity +from homeassistant.util import Throttle _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/generic/camera.py b/homeassistant/components/generic/camera.py index 01d2fb948ed..3d39d75ff4a 100644 --- a/homeassistant/components/generic/camera.py +++ b/homeassistant/components/generic/camera.py @@ -8,24 +8,24 @@ import requests from requests.auth import HTTPDigestAuth import voluptuous as vol -from homeassistant.const import ( - CONF_NAME, - CONF_USERNAME, - CONF_PASSWORD, - CONF_AUTHENTICATION, - HTTP_BASIC_AUTHENTICATION, - HTTP_DIGEST_AUTHENTICATION, - CONF_VERIFY_SSL, -) -from homeassistant.exceptions import TemplateError from homeassistant.components.camera import ( - PLATFORM_SCHEMA, DEFAULT_CONTENT_TYPE, + PLATFORM_SCHEMA, SUPPORT_STREAM, Camera, ) -from homeassistant.helpers.aiohttp_client import async_get_clientsession +from homeassistant.const import ( + CONF_AUTHENTICATION, + CONF_NAME, + CONF_PASSWORD, + CONF_USERNAME, + CONF_VERIFY_SSL, + HTTP_BASIC_AUTHENTICATION, + HTTP_DIGEST_AUTHENTICATION, +) +from homeassistant.exceptions import TemplateError from homeassistant.helpers import config_validation as cv +from homeassistant.helpers.aiohttp_client import async_get_clientsession _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/generic_thermostat/climate.py b/homeassistant/components/generic_thermostat/climate.py index 5cb4c21c577..cb5ae275df7 100644 --- a/homeassistant/components/generic_thermostat/climate.py +++ b/homeassistant/components/generic_thermostat/climate.py @@ -15,9 +15,9 @@ from homeassistant.components.climate.const import ( HVAC_MODE_HEAT, HVAC_MODE_OFF, PRESET_AWAY, + PRESET_NONE, SUPPORT_PRESET_MODE, SUPPORT_TARGET_TEMPERATURE, - PRESET_NONE, ) from homeassistant.const import ( ATTR_ENTITY_ID, diff --git a/homeassistant/components/geniushub/switch.py b/homeassistant/components/geniushub/switch.py index 79d14417dd4..b73c9a89041 100644 --- a/homeassistant/components/geniushub/switch.py +++ b/homeassistant/components/geniushub/switch.py @@ -1,5 +1,5 @@ """Support for Genius Hub switch/outlet devices.""" -from homeassistant.components.switch import SwitchDevice, DEVICE_CLASS_OUTLET +from homeassistant.components.switch import DEVICE_CLASS_OUTLET, SwitchDevice from homeassistant.helpers.typing import ConfigType, HomeAssistantType from . import DOMAIN, GeniusZone diff --git a/homeassistant/components/geo_location/__init__.py b/homeassistant/components/geo_location/__init__.py index e5c587f93ed..6142fa22209 100644 --- a/homeassistant/components/geo_location/__init__.py +++ b/homeassistant/components/geo_location/__init__.py @@ -11,7 +11,6 @@ from homeassistant.helpers.config_validation import ( # noqa: F401 from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity_component import EntityComponent - # mypy: allow-untyped-defs, no-check-untyped-defs _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/geo_rss_events/sensor.py b/homeassistant/components/geo_rss_events/sensor.py index 39e6c5c7e82..b8891cdef0d 100644 --- a/homeassistant/components/geo_rss_events/sensor.py +++ b/homeassistant/components/geo_rss_events/sensor.py @@ -8,23 +8,23 @@ and grouped by category. For more details about this platform, please refer to the documentation at https://home-assistant.io/components/sensor.geo_rss_events/ """ -import logging from datetime import timedelta +import logging -import voluptuous as vol from georss_client import UPDATE_OK, UPDATE_OK_NO_DATA from georss_client.generic_feed import GenericFeed +import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - CONF_UNIT_OF_MEASUREMENT, - CONF_NAME, CONF_LATITUDE, CONF_LONGITUDE, + CONF_NAME, CONF_RADIUS, + CONF_UNIT_OF_MEASUREMENT, CONF_URL, ) +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/github/sensor.py b/homeassistant/components/github/sensor.py index 5e8200b41ab..c77cf7930b8 100644 --- a/homeassistant/components/github/sensor.py +++ b/homeassistant/components/github/sensor.py @@ -1,6 +1,7 @@ """Support for GitHub.""" from datetime import timedelta import logging + import github import voluptuous as vol diff --git a/homeassistant/components/google/__init__.py b/homeassistant/components/google/__init__.py index 9cb9be0fa4f..0e7ccd33b33 100644 --- a/homeassistant/components/google/__init__.py +++ b/homeassistant/components/google/__init__.py @@ -1,23 +1,22 @@ """Support for Google - Calendar Event Devices.""" -from datetime import timedelta, datetime +from datetime import datetime, timedelta import logging import os -import yaml +from googleapiclient import discovery as google_discovery import httplib2 from oauth2client.client import ( - OAuth2WebServerFlow, - OAuth2DeviceCodeError, FlowExchangeError, + OAuth2DeviceCodeError, + OAuth2WebServerFlow, ) from oauth2client.file import Storage -from googleapiclient import discovery as google_discovery - import voluptuous as vol from voluptuous.error import Error as VoluptuousError +import yaml -import homeassistant.helpers.config_validation as cv from homeassistant.helpers import discovery +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import generate_entity_id from homeassistant.helpers.event import track_time_change from homeassistant.util import convert, dt diff --git a/homeassistant/components/google_cloud/tts.py b/homeassistant/components/google_cloud/tts.py index 942ee0a4e48..6721520d130 100644 --- a/homeassistant/components/google_cloud/tts.py +++ b/homeassistant/components/google_cloud/tts.py @@ -1,11 +1,11 @@ """Support for the Google Cloud TTS service.""" +import asyncio import logging import os -import asyncio import async_timeout -import voluptuous as vol from google.cloud import texttospeech +import voluptuous as vol from homeassistant.components.tts import CONF_LANG, PLATFORM_SCHEMA, Provider import homeassistant.helpers.config_validation as cv diff --git a/homeassistant/components/google_domains/__init__.py b/homeassistant/components/google_domains/__init__.py index 8f975db6fd8..d440567d9ad 100644 --- a/homeassistant/components/google_domains/__init__.py +++ b/homeassistant/components/google_domains/__init__.py @@ -7,8 +7,8 @@ import aiohttp import async_timeout import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.const import CONF_DOMAIN, CONF_PASSWORD, CONF_TIMEOUT, CONF_USERNAME +import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/google_wifi/sensor.py b/homeassistant/components/google_wifi/sensor.py index 1d4ed8d84f8..9d6f3ea3d58 100644 --- a/homeassistant/components/google_wifi/sensor.py +++ b/homeassistant/components/google_wifi/sensor.py @@ -1,21 +1,20 @@ """Support for retrieving status info from Google Wifi/OnHub routers.""" -import logging from datetime import timedelta +import logging -import voluptuous as vol import requests +import voluptuous as vol -from homeassistant.util import dt -import homeassistant.helpers.config_validation as cv from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - CONF_NAME, CONF_HOST, CONF_MONITORED_CONDITIONS, + CONF_NAME, STATE_UNKNOWN, ) +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity -from homeassistant.util import Throttle +from homeassistant.util import Throttle, dt _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/graphite/__init__.py b/homeassistant/components/graphite/__init__.py index 3809249bea6..bf34bc3ddea 100644 --- a/homeassistant/components/graphite/__init__.py +++ b/homeassistant/components/graphite/__init__.py @@ -7,7 +7,6 @@ import time import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.const import ( CONF_HOST, CONF_PORT, @@ -17,6 +16,7 @@ from homeassistant.const import ( EVENT_STATE_CHANGED, ) from homeassistant.helpers import state +import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/growatt_server/sensor.py b/homeassistant/components/growatt_server/sensor.py index 3b7109222a4..2816b86be84 100644 --- a/homeassistant/components/growatt_server/sensor.py +++ b/homeassistant/components/growatt_server/sensor.py @@ -1,17 +1,17 @@ """Read status of growatt inverters.""" -import re +import datetime import json import logging -import datetime +import re import growattServer import voluptuous as vol -from homeassistant.util import Throttle -from homeassistant.helpers.entity import Entity -import homeassistant.helpers.config_validation as cv from homeassistant.components.sensor import PLATFORM_SCHEMA -from homeassistant.const import CONF_NAME, CONF_USERNAME, CONF_PASSWORD +from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME +import homeassistant.helpers.config_validation as cv +from homeassistant.helpers.entity import Entity +from homeassistant.util import Throttle _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/generic/test_camera.py b/tests/components/generic/test_camera.py index 4708725fd3b..c25b4ce9f3d 100644 --- a/tests/components/generic/test_camera.py +++ b/tests/components/generic/test_camera.py @@ -1,6 +1,5 @@ """The tests for generic camera component.""" import asyncio - from unittest import mock from homeassistant.setup import async_setup_component diff --git a/tests/components/geo_json_events/test_geo_location.py b/tests/components/geo_json_events/test_geo_location.py index 7e356cc03f6..38c7200cce1 100644 --- a/tests/components/geo_json_events/test_geo_location.py +++ b/tests/components/geo_json_events/test_geo_location.py @@ -1,30 +1,31 @@ """The tests for the geojson platform.""" -from asynctest.mock import patch, MagicMock, call +from asynctest.mock import MagicMock, call, patch from homeassistant.components import geo_location -from homeassistant.components.geo_location import ATTR_SOURCE from homeassistant.components.geo_json_events.geo_location import ( - SCAN_INTERVAL, ATTR_EXTERNAL_ID, + SCAN_INTERVAL, SIGNAL_DELETE_ENTITY, SIGNAL_UPDATE_ENTITY, ) +from homeassistant.components.geo_location import ATTR_SOURCE from homeassistant.const import ( - CONF_URL, - EVENT_HOMEASSISTANT_START, - CONF_RADIUS, + ATTR_FRIENDLY_NAME, ATTR_LATITUDE, ATTR_LONGITUDE, - ATTR_FRIENDLY_NAME, ATTR_UNIT_OF_MEASUREMENT, CONF_LATITUDE, CONF_LONGITUDE, + CONF_RADIUS, + CONF_URL, + EVENT_HOMEASSISTANT_START, ) from homeassistant.helpers.dispatcher import DATA_DISPATCHER from homeassistant.setup import async_setup_component -from tests.common import assert_setup_component, async_fire_time_changed import homeassistant.util.dt as dt_util +from tests.common import assert_setup_component, async_fire_time_changed + URL = "http://geo.json.local/geo_json_events.json" CONFIG = { geo_location.DOMAIN: [ diff --git a/tests/components/geo_rss_events/test_sensor.py b/tests/components/geo_rss_events/test_sensor.py index 492290b9519..25243afea78 100644 --- a/tests/components/geo_rss_events/test_sensor.py +++ b/tests/components/geo_rss_events/test_sensor.py @@ -4,20 +4,21 @@ from unittest import mock from unittest.mock import MagicMock, patch from homeassistant.components import sensor +import homeassistant.components.geo_rss_events.sensor as geo_rss_events from homeassistant.const import ( - ATTR_UNIT_OF_MEASUREMENT, ATTR_FRIENDLY_NAME, - EVENT_HOMEASSISTANT_START, ATTR_ICON, + ATTR_UNIT_OF_MEASUREMENT, + EVENT_HOMEASSISTANT_START, ) from homeassistant.setup import setup_component +import homeassistant.util.dt as dt_util + from tests.common import ( - get_test_home_assistant, assert_setup_component, fire_time_changed, + get_test_home_assistant, ) -import homeassistant.components.geo_rss_events.sensor as geo_rss_events -import homeassistant.util.dt as dt_util URL = "http://geo.rss.local/geo_rss_events.xml" VALID_CONFIG_WITH_CATEGORIES = { diff --git a/tests/components/google/test_calendar.py b/tests/components/google/test_calendar.py index 496570ca468..4aace6f5484 100644 --- a/tests/components/google/test_calendar.py +++ b/tests/components/google/test_calendar.py @@ -25,7 +25,6 @@ import homeassistant.util.dt as dt_util from tests.common import async_mock_service - GOOGLE_CONFIG = {CONF_CLIENT_ID: "client_id", CONF_CLIENT_SECRET: "client_secret"} TEST_ENTITY = "calendar.we_are_we_are_a_test_calendar" TEST_ENTITY_NAME = "We are, we are, a... Test Calendar" diff --git a/tests/components/google_domains/test_init.py b/tests/components/google_domains/test_init.py index 1334e46b96f..80844063b00 100644 --- a/tests/components/google_domains/test_init.py +++ b/tests/components/google_domains/test_init.py @@ -4,8 +4,8 @@ from datetime import timedelta import pytest -from homeassistant.setup import async_setup_component from homeassistant.components import google_domains +from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow from tests.common import async_fire_time_changed diff --git a/tests/components/google_translate/test_tts.py b/tests/components/google_translate/test_tts.py index 13f9eb88fce..15e84b384c0 100644 --- a/tests/components/google_translate/test_tts.py +++ b/tests/components/google_translate/test_tts.py @@ -4,16 +4,15 @@ import os import shutil from unittest.mock import patch -import homeassistant.components.tts as tts from homeassistant.components.media_player.const import ( - SERVICE_PLAY_MEDIA, ATTR_MEDIA_CONTENT_ID, DOMAIN as DOMAIN_MP, + SERVICE_PLAY_MEDIA, ) +import homeassistant.components.tts as tts from homeassistant.setup import setup_component -from tests.common import get_test_home_assistant, assert_setup_component, mock_service - +from tests.common import assert_setup_component, get_test_home_assistant, mock_service from tests.components.tts.test_init import mutagen_mock # noqa: F401 diff --git a/tests/components/google_wifi/test_sensor.py b/tests/components/google_wifi/test_sensor.py index a9883c6be66..8a529f93f72 100644 --- a/tests/components/google_wifi/test_sensor.py +++ b/tests/components/google_wifi/test_sensor.py @@ -1,17 +1,17 @@ """The tests for the Google Wifi platform.""" -import unittest -from unittest.mock import patch, Mock from datetime import datetime, timedelta +import unittest +from unittest.mock import Mock, patch import requests_mock from homeassistant import core as ha -from homeassistant.setup import setup_component import homeassistant.components.google_wifi.sensor as google_wifi from homeassistant.const import STATE_UNKNOWN +from homeassistant.setup import setup_component from homeassistant.util import dt as dt_util -from tests.common import get_test_home_assistant, assert_setup_component +from tests.common import assert_setup_component, get_test_home_assistant NAME = "foo" diff --git a/tests/components/graphite/test_init.py b/tests/components/graphite/test_init.py index f6484f08245..dd60f03cd58 100644 --- a/tests/components/graphite/test_init.py +++ b/tests/components/graphite/test_init.py @@ -4,16 +4,17 @@ import unittest from unittest import mock from unittest.mock import patch -from homeassistant.setup import setup_component -import homeassistant.core as ha import homeassistant.components.graphite as graphite from homeassistant.const import ( - EVENT_STATE_CHANGED, EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP, - STATE_ON, + EVENT_STATE_CHANGED, STATE_OFF, + STATE_ON, ) +import homeassistant.core as ha +from homeassistant.setup import setup_component + from tests.common import get_test_home_assistant