diff --git a/homeassistant/components/owntracks/__init__.py b/homeassistant/components/owntracks/__init__.py index 8556e8a7556..b75be465aa1 100644 --- a/homeassistant/components/owntracks/__init__.py +++ b/homeassistant/components/owntracks/__init__.py @@ -14,8 +14,8 @@ from homeassistant.core import callback import homeassistant.helpers.config_validation as cv from homeassistant.setup import async_when_setup -from .const import DOMAIN from .config_flow import CONF_SECRET +from .const import DOMAIN from .messages import async_handle_message _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/owntracks/config_flow.py b/homeassistant/components/owntracks/config_flow.py index 1a8bb838e18..82f89de6363 100644 --- a/homeassistant/components/owntracks/config_flow.py +++ b/homeassistant/components/owntracks/config_flow.py @@ -1,7 +1,7 @@ """Config flow for OwnTracks.""" from homeassistant import config_entries -from homeassistant.const import CONF_WEBHOOK_ID from homeassistant.auth.util import generate_secret +from homeassistant.const import CONF_WEBHOOK_ID from .const import DOMAIN # noqa pylint: disable=unused-import from .helper import supports_encryption diff --git a/homeassistant/components/owntracks/device_tracker.py b/homeassistant/components/owntracks/device_tracker.py index 6d3254eda99..00fa023d6c1 100644 --- a/homeassistant/components/owntracks/device_tracker.py +++ b/homeassistant/components/owntracks/device_tracker.py @@ -1,21 +1,22 @@ """Device tracker platform that adds support for OwnTracks over MQTT.""" import logging -from homeassistant.core import callback +from homeassistant.components.device_tracker.config_entry import TrackerEntity +from homeassistant.components.device_tracker.const import ( + ATTR_SOURCE_TYPE, + ENTITY_ID_FORMAT, + SOURCE_TYPE_GPS, +) from homeassistant.const import ( + ATTR_BATTERY_LEVEL, ATTR_GPS_ACCURACY, ATTR_LATITUDE, ATTR_LONGITUDE, - ATTR_BATTERY_LEVEL, ) -from homeassistant.components.device_tracker.const import ( - ENTITY_ID_FORMAT, - ATTR_SOURCE_TYPE, - SOURCE_TYPE_GPS, -) -from homeassistant.components.device_tracker.config_entry import TrackerEntity -from homeassistant.helpers.restore_state import RestoreEntity +from homeassistant.core import callback from homeassistant.helpers import device_registry +from homeassistant.helpers.restore_state import RestoreEntity + from . import DOMAIN as OT_DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/owntracks/messages.py b/homeassistant/components/owntracks/messages.py index 7c388f9eb17..d357843c42e 100644 --- a/homeassistant/components/owntracks/messages.py +++ b/homeassistant/components/owntracks/messages.py @@ -2,15 +2,14 @@ import json import logging -from nacl.secret import SecretBox from nacl.encoding import Base64Encoder +from nacl.secret import SecretBox from homeassistant.components import zone as zone_comp from homeassistant.components.device_tracker import ( - SOURCE_TYPE_GPS, SOURCE_TYPE_BLUETOOTH_LE, + SOURCE_TYPE_GPS, ) - from homeassistant.const import STATE_HOME from homeassistant.util import decorator, slugify diff --git a/tests/components/owntracks/test_config_flow.py b/tests/components/owntracks/test_config_flow.py index 54e33a1ab61..d48c3c43a25 100644 --- a/tests/components/owntracks/test_config_flow.py +++ b/tests/components/owntracks/test_config_flow.py @@ -1,16 +1,16 @@ """Tests for OwnTracks config flow.""" from unittest.mock import Mock, patch + import pytest from homeassistant import data_entry_flow -from homeassistant.const import CONF_WEBHOOK_ID from homeassistant.components.owntracks import config_flow from homeassistant.components.owntracks.config_flow import CONF_CLOUDHOOK, CONF_SECRET from homeassistant.components.owntracks.const import DOMAIN +from homeassistant.const import CONF_WEBHOOK_ID from homeassistant.setup import async_setup_component -from tests.common import mock_coro, MockConfigEntry - +from tests.common import MockConfigEntry, mock_coro CONF_WEBHOOK_URL = "webhook_url" diff --git a/tests/components/owntracks/test_helper.py b/tests/components/owntracks/test_helper.py index f870ce82dd3..2c06ac0c4e7 100644 --- a/tests/components/owntracks/test_helper.py +++ b/tests/components/owntracks/test_helper.py @@ -1,5 +1,6 @@ """Test the owntracks_http platform.""" from unittest.mock import patch + import pytest from homeassistant.components.owntracks import helper diff --git a/tests/components/owntracks/test_init.py b/tests/components/owntracks/test_init.py index aab772d64e3..78ae687e208 100644 --- a/tests/components/owntracks/test_init.py +++ b/tests/components/owntracks/test_init.py @@ -3,9 +3,10 @@ import asyncio import pytest -from homeassistant.setup import async_setup_component from homeassistant.components import owntracks -from tests.common import mock_component, MockConfigEntry +from homeassistant.setup import async_setup_component + +from tests.common import MockConfigEntry, mock_component MINIMAL_LOCATION_MESSAGE = { "_type": "location",