diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py index 65b1cd2ae1a6..80bc1dccff44 100644 --- a/homeassistant/__main__.py +++ b/homeassistant/__main__.py @@ -7,7 +7,6 @@ import subprocess import sys import threading - from typing import List, Dict, Any # noqa pylint: disable=unused-import diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py index 2051359c0bae..2125ab46a8c5 100644 --- a/homeassistant/bootstrap.py +++ b/homeassistant/bootstrap.py @@ -5,7 +5,6 @@ import sys from time import time from collections import OrderedDict - from typing import Any, Optional, Dict import voluptuous as vol diff --git a/homeassistant/components/apple_tv.py b/homeassistant/components/apple_tv.py index 97fb2363024f..21ff0e3286d6 100644 --- a/homeassistant/components/apple_tv.py +++ b/homeassistant/components/apple_tv.py @@ -6,7 +6,6 @@ """ import asyncio import logging - from typing import Sequence, TypeVar, Union import voluptuous as vol diff --git a/homeassistant/components/geo_location/demo.py b/homeassistant/components/geo_location/demo.py index 8e8d82110860..ddec369e696a 100644 --- a/homeassistant/components/geo_location/demo.py +++ b/homeassistant/components/geo_location/demo.py @@ -8,7 +8,6 @@ import random from datetime import timedelta from math import pi, cos, sin, radians - from typing import Optional from homeassistant.components.geo_location import GeoLocationEvent diff --git a/homeassistant/components/google_assistant/__init__.py b/homeassistant/components/google_assistant/__init__.py index 567a6d842339..22569af1f868 100644 --- a/homeassistant/components/google_assistant/__init__.py +++ b/homeassistant/components/google_assistant/__init__.py @@ -6,6 +6,7 @@ """ import asyncio import logging +from typing import Dict, Any import aiohttp import async_timeout @@ -14,7 +15,6 @@ # Typing imports from homeassistant.core import HomeAssistant -from typing import Dict, Any from homeassistant.const import CONF_NAME from homeassistant.helpers import config_validation as cv diff --git a/homeassistant/components/google_assistant/auth.py b/homeassistant/components/google_assistant/auth.py index e80b2282066b..5b98e25014db 100644 --- a/homeassistant/components/google_assistant/auth.py +++ b/homeassistant/components/google_assistant/auth.py @@ -1,11 +1,11 @@ """Google Assistant OAuth View.""" import logging +from typing import Dict, Any # Typing imports # if False: from aiohttp.web import Request, Response -from typing import Dict, Any from homeassistant.core import HomeAssistant from homeassistant.components.http import HomeAssistantView diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py index 83b84f5c3bb6..83c3595ebd9c 100644 --- a/homeassistant/components/media_player/cast.py +++ b/homeassistant/components/media_player/cast.py @@ -7,7 +7,6 @@ import asyncio import logging import threading - from typing import Optional, Tuple import attr diff --git a/homeassistant/components/media_player/webostv.py b/homeassistant/components/media_player/webostv.py index b3cd07b9d35d..b5240bdb9f5f 100644 --- a/homeassistant/components/media_player/webostv.py +++ b/homeassistant/components/media_player/webostv.py @@ -8,9 +8,7 @@ from datetime import timedelta import logging from urllib.parse import urlparse - -# pylint: disable=unused-import -from typing import Dict # noqa: F401 +from typing import Dict # noqa: F401 pylint: disable=unused-import import voluptuous as vol diff --git a/homeassistant/components/rachio.py b/homeassistant/components/rachio.py index 0e67e15d5c09..cd80b7bec9be 100644 --- a/homeassistant/components/rachio.py +++ b/homeassistant/components/rachio.py @@ -6,10 +6,10 @@ """ import asyncio import logging +from typing import Optional from aiohttp import web import voluptuous as vol -from typing import Optional from homeassistant.auth.util import generate_secret from homeassistant.components.http import HomeAssistantView from homeassistant.const import CONF_API_KEY, EVENT_HOMEASSISTANT_STOP, URL_API diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py index 47d6e181c8f8..a3cd2eebd8c7 100644 --- a/homeassistant/components/recorder/__init__.py +++ b/homeassistant/components/recorder/__init__.py @@ -15,7 +15,6 @@ import queue import threading import time - from typing import Any, Dict, Optional # noqa: F401 import voluptuous as vol diff --git a/homeassistant/config.py b/homeassistant/config.py index d742e62660b9..5474b283494e 100644 --- a/homeassistant/config.py +++ b/homeassistant/config.py @@ -6,8 +6,7 @@ import os import re import shutil -# pylint: disable=unused-import -from typing import ( # noqa: F401 +from typing import ( # noqa: F401 pylint: disable=unused-import Any, Tuple, Optional, Dict, List, Union, Callable, Sequence, Set) from types import ModuleType import voluptuous as vol diff --git a/homeassistant/core.py b/homeassistant/core.py index 2b7a2479471d..fdbbe49ea05d 100644 --- a/homeassistant/core.py +++ b/homeassistant/core.py @@ -18,8 +18,7 @@ import uuid from types import MappingProxyType -# pylint: disable=unused-import -from typing import ( # NOQA +from typing import ( # noqa: F401 pylint: disable=unused-import Optional, Any, Callable, List, TypeVar, Dict, Coroutine, Set, TYPE_CHECKING, Awaitable, Iterator) diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py index a54c07fc1b82..ecf9850a67c4 100644 --- a/homeassistant/data_entry_flow.py +++ b/homeassistant/data_entry_flow.py @@ -1,8 +1,8 @@ """Classes to help gather user submissions.""" import logging +from typing import Dict, Any, Callable, Hashable, List, Optional # noqa pylint: disable=unused-import import uuid import voluptuous as vol -from typing import Dict, Any, Callable, Hashable, List, Optional # noqa pylint: disable=unused-import from .core import callback, HomeAssistant from .exceptions import HomeAssistantError diff --git a/homeassistant/helpers/__init__.py b/homeassistant/helpers/__init__.py index ed489ed858b0..abc3b7a23243 100644 --- a/homeassistant/helpers/__init__.py +++ b/homeassistant/helpers/__init__.py @@ -1,6 +1,5 @@ """Helper methods for components within Home Assistant.""" import re - from typing import Any, Iterable, Tuple, Sequence, Dict from homeassistant.const import CONF_PLATFORM diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py index 90098a677a14..3363b199b0be 100644 --- a/homeassistant/helpers/config_validation.py +++ b/homeassistant/helpers/config_validation.py @@ -7,7 +7,6 @@ from socket import _GLOBAL_DEFAULT_TIMEOUT import logging import inspect - from typing import Any, Union, TypeVar, Callable, Sequence, Dict import voluptuous as vol diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py index 695da5bce9c7..e48af6a33657 100644 --- a/homeassistant/helpers/entity.py +++ b/homeassistant/helpers/entity.py @@ -4,7 +4,6 @@ import logging import functools as ft from timeit import default_timer as timer - from typing import Optional, List, Iterable from homeassistant.const import ( diff --git a/homeassistant/helpers/json.py b/homeassistant/helpers/json.py index c28ee8c5c2cb..bdb82687a320 100644 --- a/homeassistant/helpers/json.py +++ b/homeassistant/helpers/json.py @@ -2,7 +2,6 @@ from datetime import datetime import json import logging - from typing import Any _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/loader.py b/homeassistant/loader.py index 3ac49e354b5d..6fb003926e1d 100644 --- a/homeassistant/loader.py +++ b/homeassistant/loader.py @@ -15,9 +15,7 @@ import logging import sys from types import ModuleType - -# pylint: disable=unused-import -from typing import Optional, Set, TYPE_CHECKING, Callable, Any, TypeVar # NOQA +from typing import Optional, Set, TYPE_CHECKING, Callable, Any, TypeVar # noqa pylint: disable=unused-import from homeassistant.const import PLATFORM_FORMAT from homeassistant.util import OrderedSet diff --git a/homeassistant/scripts/__init__.py b/homeassistant/scripts/__init__.py index 7aba3b2561cb..02cc0bff3622 100644 --- a/homeassistant/scripts/__init__.py +++ b/homeassistant/scripts/__init__.py @@ -5,7 +5,6 @@ import logging import os import sys - from typing import List from homeassistant.bootstrap import async_mount_local_lib_path diff --git a/homeassistant/scripts/check_config.py b/homeassistant/scripts/check_config.py index e0c933df5bbc..94add794651a 100644 --- a/homeassistant/scripts/check_config.py +++ b/homeassistant/scripts/check_config.py @@ -6,10 +6,10 @@ from collections import OrderedDict, namedtuple from glob import glob from platform import system +from typing import Dict, List, Sequence from unittest.mock import patch import attr -from typing import Dict, List, Sequence import voluptuous as vol from homeassistant import bootstrap, core, loader diff --git a/homeassistant/scripts/influxdb_import.py b/homeassistant/scripts/influxdb_import.py index 031df1d3a72a..a6dd90920c3b 100644 --- a/homeassistant/scripts/influxdb_import.py +++ b/homeassistant/scripts/influxdb_import.py @@ -3,7 +3,6 @@ import json import os import sys - from typing import List import homeassistant.config as config_util diff --git a/homeassistant/scripts/influxdb_migrator.py b/homeassistant/scripts/influxdb_migrator.py index a4c0df74b091..04d54cd3fa8c 100644 --- a/homeassistant/scripts/influxdb_migrator.py +++ b/homeassistant/scripts/influxdb_migrator.py @@ -2,7 +2,6 @@ import argparse import sys - from typing import List diff --git a/homeassistant/util/__init__.py b/homeassistant/util/__init__.py index 1e74c500fc16..17849154ff76 100644 --- a/homeassistant/util/__init__.py +++ b/homeassistant/util/__init__.py @@ -11,7 +11,6 @@ from functools import wraps from types import MappingProxyType from unicodedata import normalize - from typing import (Any, Optional, TypeVar, Callable, KeysView, Union, # noqa Iterable, List, Dict, Iterator, Coroutine, MutableSet) diff --git a/homeassistant/util/dt.py b/homeassistant/util/dt.py index 729195fb3fd4..5d4b10454a7b 100644 --- a/homeassistant/util/dt.py +++ b/homeassistant/util/dt.py @@ -1,9 +1,7 @@ """Helper methods to handle the time in Home Assistant.""" import datetime as dt import re - -# pylint: disable=unused-import -from typing import Any, Dict, Union, Optional, Tuple # NOQA +from typing import Any, Dict, Union, Optional, Tuple # noqa pylint: disable=unused-import import pytz import pytz.exceptions as pytzexceptions diff --git a/homeassistant/util/package.py b/homeassistant/util/package.py index 422809f75943..925755eb741d 100644 --- a/homeassistant/util/package.py +++ b/homeassistant/util/package.py @@ -4,7 +4,6 @@ import os from subprocess import PIPE, Popen import sys - from typing import Optional _LOGGER = logging.getLogger(__name__) diff --git a/setup.cfg b/setup.cfg index 7813cc5c0472..a8bd819c7921 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,6 +32,4 @@ indent = " " not_skip = __init__.py # will group `import x` and `from x import` of the same module. force_sort_within_sections = true -# typing is stdlib on py35 but 3rd party on py34, let it hang in between -known_inbetweens = typing sections = FUTURE,STDLIB,INBETWEENS,THIRDPARTY,FIRSTPARTY,LOCALFOLDER