From 3d6440589629c5f6bd2c025fc16c127ee20ac1ce Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Sun, 8 Dec 2019 18:48:18 +0100 Subject: [PATCH] Sort imports according to PEP8 for recorder (#29652) --- homeassistant/components/recorder/__init__.py | 8 ++++---- homeassistant/components/recorder/migration.py | 2 +- homeassistant/components/recorder/models.py | 4 ++-- homeassistant/components/recorder/purge.py | 2 +- tests/components/recorder/models_original.py | 4 ++-- tests/components/recorder/test_init.py | 8 ++++---- tests/components/recorder/test_migrate.py | 5 +++-- tests/components/recorder/test_models.py | 6 +++--- tests/components/recorder/test_purge.py | 5 +++-- tests/components/recorder/test_util.py | 3 ++- 10 files changed, 25 insertions(+), 22 deletions(-) diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py index 10b1d04304f..7ae1cb1a220 100644 --- a/homeassistant/components/recorder/__init__.py +++ b/homeassistant/components/recorder/__init__.py @@ -5,18 +5,19 @@ import concurrent.futures from datetime import datetime, timedelta import logging import queue +from sqlite3 import Connection import threading import time from typing import Any, Dict, Optional -from sqlite3 import Connection -import voluptuous as vol -from sqlalchemy import exc, create_engine +from sqlalchemy import create_engine, exc from sqlalchemy.engine import Engine from sqlalchemy.event import listens_for from sqlalchemy.orm import scoped_session, sessionmaker from sqlalchemy.pool import StaticPool +import voluptuous as vol +from homeassistant.components import persistent_notification from homeassistant.const import ( ATTR_ENTITY_ID, CONF_DOMAINS, @@ -29,7 +30,6 @@ from homeassistant.const import ( EVENT_TIME_CHANGED, MATCH_ALL, ) -from homeassistant.components import persistent_notification from homeassistant.core import CoreState, HomeAssistant, callback import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entityfilter import generate_filter diff --git a/homeassistant/components/recorder/migration.py b/homeassistant/components/recorder/migration.py index 33a01ea1ac0..3a5ef2729be 100644 --- a/homeassistant/components/recorder/migration.py +++ b/homeassistant/components/recorder/migration.py @@ -6,7 +6,7 @@ from sqlalchemy import Table, text from sqlalchemy.engine import reflection from sqlalchemy.exc import OperationalError, SQLAlchemyError -from .models import SchemaChanges, SCHEMA_VERSION, Base +from .models import SCHEMA_VERSION, Base, SchemaChanges from .util import session_scope _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/recorder/models.py b/homeassistant/components/recorder/models.py index b512bfc8204..f3e80a9a739 100644 --- a/homeassistant/components/recorder/models.py +++ b/homeassistant/components/recorder/models.py @@ -1,6 +1,6 @@ """Models for SQLAlchemy.""" -import json from datetime import datetime +import json import logging from sqlalchemy import ( @@ -17,9 +17,9 @@ from sqlalchemy import ( from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm.session import Session -import homeassistant.util.dt as dt_util from homeassistant.core import Context, Event, EventOrigin, State, split_entity_id from homeassistant.helpers.json import JSONEncoder +import homeassistant.util.dt as dt_util # SQLAlchemy Schema # pylint: disable=invalid-name diff --git a/homeassistant/components/recorder/purge.py b/homeassistant/components/recorder/purge.py index 089476245fe..b4b1f612fac 100644 --- a/homeassistant/components/recorder/purge.py +++ b/homeassistant/components/recorder/purge.py @@ -5,8 +5,8 @@ import logging from sqlalchemy.exc import SQLAlchemyError import homeassistant.util.dt as dt_util -from .models import Events, States +from .models import Events, States from .util import session_scope _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/recorder/models_original.py b/tests/components/recorder/models_original.py index 526116aae7b..25978ef6d55 100644 --- a/tests/components/recorder/models_original.py +++ b/tests/components/recorder/models_original.py @@ -4,8 +4,8 @@ This file contains the original models definitions before schema tracking was implemented. It is used to test the schema migration logic. """ -import json from datetime import datetime +import json import logging from sqlalchemy import ( @@ -21,9 +21,9 @@ from sqlalchemy import ( ) from sqlalchemy.ext.declarative import declarative_base -import homeassistant.util.dt as dt_util from homeassistant.core import Event, EventOrigin, State, split_entity_id from homeassistant.helpers.json import JSONEncoder +import homeassistant.util.dt as dt_util # SQLAlchemy Schema # pylint: disable=invalid-name diff --git a/tests/components/recorder/test_init.py b/tests/components/recorder/test_init.py index 0f5ee24e6e8..2ee3126b9fa 100644 --- a/tests/components/recorder/test_init.py +++ b/tests/components/recorder/test_init.py @@ -5,13 +5,13 @@ from unittest.mock import patch import pytest -from homeassistant.core import callback -from homeassistant.const import MATCH_ALL -from homeassistant.setup import async_setup_component from homeassistant.components.recorder import Recorder from homeassistant.components.recorder.const import DATA_INSTANCE +from homeassistant.components.recorder.models import Events, States from homeassistant.components.recorder.util import session_scope -from homeassistant.components.recorder.models import States, Events +from homeassistant.const import MATCH_ALL +from homeassistant.core import callback +from homeassistant.setup import async_setup_component from tests.common import get_test_home_assistant, init_recorder_component diff --git a/tests/components/recorder/test_migrate.py b/tests/components/recorder/test_migrate.py index 81e0423a723..7947ba5ccef 100644 --- a/tests/components/recorder/test_migrate.py +++ b/tests/components/recorder/test_migrate.py @@ -1,13 +1,14 @@ """The tests for the Recorder component.""" # pylint: disable=protected-access -from unittest.mock import patch, call +from unittest.mock import call, patch import pytest from sqlalchemy import create_engine from sqlalchemy.pool import StaticPool from homeassistant.bootstrap import async_setup_component -from homeassistant.components.recorder import migration, const, models +from homeassistant.components.recorder import const, migration, models + from tests.components.recorder import models_original diff --git a/tests/components/recorder/test_models.py b/tests/components/recorder/test_models.py index 5d4ac46102e..276194b5d6c 100644 --- a/tests/components/recorder/test_models.py +++ b/tests/components/recorder/test_models.py @@ -1,14 +1,14 @@ """The tests for the Recorder component.""" -import unittest from datetime import datetime +import unittest from sqlalchemy import create_engine from sqlalchemy.orm import scoped_session, sessionmaker -import homeassistant.core as ha +from homeassistant.components.recorder.models import Base, Events, RecorderRuns, States from homeassistant.const import EVENT_STATE_CHANGED +import homeassistant.core as ha from homeassistant.util import dt -from homeassistant.components.recorder.models import Base, Events, States, RecorderRuns ENGINE = None SESSION = None diff --git a/tests/components/recorder/test_purge.py b/tests/components/recorder/test_purge.py index 7e06dcd1e5e..e0993b8cffc 100644 --- a/tests/components/recorder/test_purge.py +++ b/tests/components/recorder/test_purge.py @@ -1,14 +1,15 @@ """Test data purging.""" -import json from datetime import datetime, timedelta +import json import unittest from unittest.mock import patch from homeassistant.components import recorder from homeassistant.components.recorder.const import DATA_INSTANCE +from homeassistant.components.recorder.models import Events, States from homeassistant.components.recorder.purge import purge_old_data -from homeassistant.components.recorder.models import States, Events from homeassistant.components.recorder.util import session_scope + from tests.common import get_test_home_assistant, init_recorder_component diff --git a/tests/components/recorder/test_util.py b/tests/components/recorder/test_util.py index 8dcfac3c001..47f2bf4beca 100644 --- a/tests/components/recorder/test_util.py +++ b/tests/components/recorder/test_util.py @@ -1,10 +1,11 @@ """Test util methods.""" -from unittest.mock import patch, MagicMock +from unittest.mock import MagicMock, patch import pytest from homeassistant.components.recorder import util from homeassistant.components.recorder.const import DATA_INSTANCE + from tests.common import get_test_home_assistant, init_recorder_component