From 6ad3b6426a46ed26e37eee35dce700572d765ddc Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Sun, 8 Dec 2019 14:55:23 +0100 Subject: [PATCH] sort imports according to PEP8 for auth (#29619) --- homeassistant/components/auth/__init__.py | 14 ++++++-------- homeassistant/components/auth/indieauth.py | 6 +++--- homeassistant/components/auth/login_flow.py | 5 +++-- homeassistant/components/auth/mfa_setup_flow.py | 2 +- tests/components/auth/__init__.py | 1 - tests/components/auth/test_init.py | 6 +++--- tests/components/auth/test_mfa_setup_flow.py | 2 +- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py index d0da9d39fe8..888ef98a582 100644 --- a/homeassistant/components/auth/__init__.py +++ b/homeassistant/components/auth/__init__.py @@ -114,31 +114,29 @@ Result will be a long-lived access token: } """ +from datetime import timedelta import logging import uuid -from datetime import timedelta from aiohttp import web import voluptuous as vol from homeassistant.auth.models import ( - User, - Credentials, TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN, + Credentials, + User, ) -from homeassistant.loader import bind_hass from homeassistant.components import websocket_api from homeassistant.components.http import KEY_REAL_IP from homeassistant.components.http.auth import async_sign_path from homeassistant.components.http.ban import log_invalid_auth from homeassistant.components.http.data_validator import RequestDataValidator from homeassistant.components.http.view import HomeAssistantView -from homeassistant.core import callback, HomeAssistant +from homeassistant.core import HomeAssistant, callback +from homeassistant.loader import bind_hass from homeassistant.util import dt as dt_util -from . import indieauth -from . import login_flow -from . import mfa_setup_flow +from . import indieauth, login_flow, mfa_setup_flow DOMAIN = "auth" WS_TYPE_CURRENT_USER = "auth/current_user" diff --git a/homeassistant/components/auth/indieauth.py b/homeassistant/components/auth/indieauth.py index 6a0a516bee2..c845f230bf3 100644 --- a/homeassistant/components/auth/indieauth.py +++ b/homeassistant/components/auth/indieauth.py @@ -1,9 +1,9 @@ """Helpers to resolve client ID/secret.""" -import logging import asyncio -from ipaddress import ip_address from html.parser import HTMLParser -from urllib.parse import urlparse, urljoin +from ipaddress import ip_address +import logging +from urllib.parse import urljoin, urlparse import aiohttp diff --git a/homeassistant/components/auth/login_flow.py b/homeassistant/components/auth/login_flow.py index d6844396ce7..6f8d2751018 100644 --- a/homeassistant/components/auth/login_flow.py +++ b/homeassistant/components/auth/login_flow.py @@ -73,12 +73,13 @@ import voluptuous_serialize from homeassistant import data_entry_flow from homeassistant.components.http import KEY_REAL_IP from homeassistant.components.http.ban import ( - process_wrong_login, - process_success_login, log_invalid_auth, + process_success_login, + process_wrong_login, ) from homeassistant.components.http.data_validator import RequestDataValidator from homeassistant.components.http.view import HomeAssistantView + from . import indieauth diff --git a/homeassistant/components/auth/mfa_setup_flow.py b/homeassistant/components/auth/mfa_setup_flow.py index 271e9ae1634..92926e2e7c5 100644 --- a/homeassistant/components/auth/mfa_setup_flow.py +++ b/homeassistant/components/auth/mfa_setup_flow.py @@ -6,7 +6,7 @@ import voluptuous_serialize from homeassistant import data_entry_flow from homeassistant.components import websocket_api -from homeassistant.core import callback, HomeAssistant +from homeassistant.core import HomeAssistant, callback WS_TYPE_SETUP_MFA = "auth/setup_mfa" SCHEMA_WS_SETUP_MFA = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend( diff --git a/tests/components/auth/__init__.py b/tests/components/auth/__init__.py index 5114e18889b..7ce65964086 100644 --- a/tests/components/auth/__init__.py +++ b/tests/components/auth/__init__.py @@ -4,7 +4,6 @@ from homeassistant.setup import async_setup_component from tests.common import ensure_auth_manager_loaded - BASE_CONFIG = [ { "name": "Example", diff --git a/tests/components/auth/test_init.py b/tests/components/auth/test_init.py index de91613b74b..162569aa0e8 100644 --- a/tests/components/auth/test_init.py +++ b/tests/components/auth/test_init.py @@ -3,15 +3,15 @@ from datetime import timedelta from unittest.mock import patch from homeassistant.auth.models import Credentials +from homeassistant.components import auth from homeassistant.components.auth import RESULT_TYPE_USER from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow -from homeassistant.components import auth - -from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, MockUser from . import async_setup_auth +from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, MockUser + async def test_login_new_user_and_trying_refresh_token(hass, aiohttp_client): """Test logging in with new user and refreshing tokens.""" diff --git a/tests/components/auth/test_mfa_setup_flow.py b/tests/components/auth/test_mfa_setup_flow.py index ffce9266e57..3569d7d5233 100644 --- a/tests/components/auth/test_mfa_setup_flow.py +++ b/tests/components/auth/test_mfa_setup_flow.py @@ -4,7 +4,7 @@ from homeassistant.auth import auth_manager_from_config from homeassistant.components.auth import mfa_setup_flow from homeassistant.setup import async_setup_component -from tests.common import MockUser, CLIENT_ID, ensure_auth_manager_loaded +from tests.common import CLIENT_ID, MockUser, ensure_auth_manager_loaded async def test_ws_setup_depose_mfa(hass, hass_ws_client):