Sort imports according to PEP8 for recorder (#29652)

This commit is contained in:
Bas Nijholt 2019-12-08 18:48:18 +01:00 committed by Franck Nijhof
parent b832749e3c
commit 3d64405896
10 changed files with 25 additions and 22 deletions

View File

@ -5,18 +5,19 @@ import concurrent.futures
from datetime import datetime, timedelta from datetime import datetime, timedelta
import logging import logging
import queue import queue
from sqlite3 import Connection
import threading import threading
import time import time
from typing import Any, Dict, Optional from typing import Any, Dict, Optional
from sqlite3 import Connection
import voluptuous as vol from sqlalchemy import create_engine, exc
from sqlalchemy import exc, create_engine
from sqlalchemy.engine import Engine from sqlalchemy.engine import Engine
from sqlalchemy.event import listens_for from sqlalchemy.event import listens_for
from sqlalchemy.orm import scoped_session, sessionmaker from sqlalchemy.orm import scoped_session, sessionmaker
from sqlalchemy.pool import StaticPool from sqlalchemy.pool import StaticPool
import voluptuous as vol
from homeassistant.components import persistent_notification
from homeassistant.const import ( from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_ENTITY_ID,
CONF_DOMAINS, CONF_DOMAINS,
@ -29,7 +30,6 @@ from homeassistant.const import (
EVENT_TIME_CHANGED, EVENT_TIME_CHANGED,
MATCH_ALL, MATCH_ALL,
) )
from homeassistant.components import persistent_notification
from homeassistant.core import CoreState, HomeAssistant, callback from homeassistant.core import CoreState, HomeAssistant, callback
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entityfilter import generate_filter from homeassistant.helpers.entityfilter import generate_filter

View File

@ -6,7 +6,7 @@ from sqlalchemy import Table, text
from sqlalchemy.engine import reflection from sqlalchemy.engine import reflection
from sqlalchemy.exc import OperationalError, SQLAlchemyError 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 from .util import session_scope
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)

View File

@ -1,6 +1,6 @@
"""Models for SQLAlchemy.""" """Models for SQLAlchemy."""
import json
from datetime import datetime from datetime import datetime
import json
import logging import logging
from sqlalchemy import ( from sqlalchemy import (
@ -17,9 +17,9 @@ from sqlalchemy import (
from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm.session import Session 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.core import Context, Event, EventOrigin, State, split_entity_id
from homeassistant.helpers.json import JSONEncoder from homeassistant.helpers.json import JSONEncoder
import homeassistant.util.dt as dt_util
# SQLAlchemy Schema # SQLAlchemy Schema
# pylint: disable=invalid-name # pylint: disable=invalid-name

View File

@ -5,8 +5,8 @@ import logging
from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.exc import SQLAlchemyError
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
from .models import Events, States
from .models import Events, States
from .util import session_scope from .util import session_scope
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)

View File

@ -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. implemented. It is used to test the schema migration logic.
""" """
import json
from datetime import datetime from datetime import datetime
import json
import logging import logging
from sqlalchemy import ( from sqlalchemy import (
@ -21,9 +21,9 @@ from sqlalchemy import (
) )
from sqlalchemy.ext.declarative import declarative_base 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.core import Event, EventOrigin, State, split_entity_id
from homeassistant.helpers.json import JSONEncoder from homeassistant.helpers.json import JSONEncoder
import homeassistant.util.dt as dt_util
# SQLAlchemy Schema # SQLAlchemy Schema
# pylint: disable=invalid-name # pylint: disable=invalid-name

View File

@ -5,13 +5,13 @@ from unittest.mock import patch
import pytest 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 import Recorder
from homeassistant.components.recorder.const import DATA_INSTANCE 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.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 from tests.common import get_test_home_assistant, init_recorder_component

View File

@ -1,13 +1,14 @@
"""The tests for the Recorder component.""" """The tests for the Recorder component."""
# pylint: disable=protected-access # pylint: disable=protected-access
from unittest.mock import patch, call from unittest.mock import call, patch
import pytest import pytest
from sqlalchemy import create_engine from sqlalchemy import create_engine
from sqlalchemy.pool import StaticPool from sqlalchemy.pool import StaticPool
from homeassistant.bootstrap import async_setup_component 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 from tests.components.recorder import models_original

View File

@ -1,14 +1,14 @@
"""The tests for the Recorder component.""" """The tests for the Recorder component."""
import unittest
from datetime import datetime from datetime import datetime
import unittest
from sqlalchemy import create_engine from sqlalchemy import create_engine
from sqlalchemy.orm import scoped_session, sessionmaker 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 from homeassistant.const import EVENT_STATE_CHANGED
import homeassistant.core as ha
from homeassistant.util import dt from homeassistant.util import dt
from homeassistant.components.recorder.models import Base, Events, States, RecorderRuns
ENGINE = None ENGINE = None
SESSION = None SESSION = None

View File

@ -1,14 +1,15 @@
"""Test data purging.""" """Test data purging."""
import json
from datetime import datetime, timedelta from datetime import datetime, timedelta
import json
import unittest import unittest
from unittest.mock import patch from unittest.mock import patch
from homeassistant.components import recorder from homeassistant.components import recorder
from homeassistant.components.recorder.const import DATA_INSTANCE 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.purge import purge_old_data
from homeassistant.components.recorder.models import States, Events
from homeassistant.components.recorder.util import session_scope from homeassistant.components.recorder.util import session_scope
from tests.common import get_test_home_assistant, init_recorder_component from tests.common import get_test_home_assistant, init_recorder_component

View File

@ -1,10 +1,11 @@
"""Test util methods.""" """Test util methods."""
from unittest.mock import patch, MagicMock from unittest.mock import MagicMock, patch
import pytest import pytest
from homeassistant.components.recorder import util from homeassistant.components.recorder import util
from homeassistant.components.recorder.const import DATA_INSTANCE from homeassistant.components.recorder.const import DATA_INSTANCE
from tests.common import get_test_home_assistant, init_recorder_component from tests.common import get_test_home_assistant, init_recorder_component