From 384f63dd1d1027771bcfeb82ead0d244c792217f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 29 Jan 2018 10:24:08 +0200
Subject: [PATCH] Typing fixes (#12015)
* .gitignore: Add .mypy_cache
* Typing fixes
---
.gitignore | 3 +++
homeassistant/components/alert.py | 2 +-
homeassistant/components/binary_sensor/ihc.py | 3 ++-
homeassistant/components/cover/isy994.py | 2 +-
homeassistant/components/device_tracker/unifi.py | 2 +-
homeassistant/components/fan/comfoconnect.py | 4 ++--
homeassistant/components/hdmi_cec.py | 2 +-
homeassistant/components/ihc/ihcdevice.py | 2 +-
homeassistant/components/light/ihc.py | 2 +-
homeassistant/components/light/tplink.py | 2 +-
homeassistant/components/media_player/hdmi_cec.py | 2 +-
homeassistant/components/media_player/onkyo.py | 3 +++
homeassistant/components/media_player/webostv.py | 3 +++
homeassistant/components/pilight.py | 2 +-
homeassistant/components/recorder/__init__.py | 2 +-
homeassistant/components/sensor/comfoconnect.py | 3 ++-
homeassistant/components/sensor/daikin.py | 3 ++-
homeassistant/components/sensor/ihc.py | 2 +-
homeassistant/components/switch/hdmi_cec.py | 2 +-
homeassistant/components/switch/ihc.py | 2 +-
homeassistant/loader.py | 2 +-
homeassistant/util/dt.py | 2 +-
homeassistant/util/unit_system.py | 2 +-
23 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index c8a6fed2ddf..fe26f43e8bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,6 @@ desktop.ini
/home-assistant.pyproj
/home-assistant.sln
/.vs/*
+
+# mypy
+/.mypy_cache/*
diff --git a/homeassistant/components/alert.py b/homeassistant/components/alert.py
index 27d1625fd6b..eb941e22877 100644
--- a/homeassistant/components/alert.py
+++ b/homeassistant/components/alert.py
@@ -277,7 +277,7 @@ class Alert(ToggleEntity):
yield from self.async_update_ha_state()
@asyncio.coroutine
- def async_toggle(self):
+ def async_toggle(self, **kwargs):
"""Async toggle alert."""
if self._ack:
return self.async_turn_on()
diff --git a/homeassistant/components/binary_sensor/ihc.py b/homeassistant/components/binary_sensor/ihc.py
index 14e45f88cf1..04f8c0d00dd 100644
--- a/homeassistant/components/binary_sensor/ihc.py
+++ b/homeassistant/components/binary_sensor/ihc.py
@@ -69,7 +69,8 @@ class IHCBinarySensor(IHCDevice, BinarySensorDevice):
"""
def __init__(self, ihc_controller, name, ihc_id: int, info: bool,
- sensor_type: str, inverting: bool, product: Element=None):
+ sensor_type: str, inverting: bool,
+ product: Element=None) -> None:
"""Initialize the IHC binary sensor."""
super().__init__(ihc_controller, name, ihc_id, info, product)
self._state = None
diff --git a/homeassistant/components/cover/isy994.py b/homeassistant/components/cover/isy994.py
index b187b8409c2..7d77b1bc3be 100644
--- a/homeassistant/components/cover/isy994.py
+++ b/homeassistant/components/cover/isy994.py
@@ -42,7 +42,7 @@ def setup_platform(hass, config: ConfigType,
class ISYCoverDevice(ISYDevice, CoverDevice):
"""Representation of an ISY994 cover device."""
- def __init__(self, node: object):
+ def __init__(self, node: object) -> None:
"""Initialize the ISY994 cover device."""
super().__init__(node)
diff --git a/homeassistant/components/device_tracker/unifi.py b/homeassistant/components/device_tracker/unifi.py
index a3e81b3ef51..d5b6b044f1f 100644
--- a/homeassistant/components/device_tracker/unifi.py
+++ b/homeassistant/components/device_tracker/unifi.py
@@ -75,7 +75,7 @@ def get_scanner(hass, config):
class UnifiScanner(DeviceScanner):
"""Provide device_tracker support from Unifi WAP client data."""
- def __init__(self, controller, detection_time: timedelta):
+ def __init__(self, controller, detection_time: timedelta) -> None:
"""Initialize the scanner."""
self._detection_time = detection_time
self._controller = controller
diff --git a/homeassistant/components/fan/comfoconnect.py b/homeassistant/components/fan/comfoconnect.py
index ab32e588c03..c6d1232801f 100644
--- a/homeassistant/components/fan/comfoconnect.py
+++ b/homeassistant/components/fan/comfoconnect.py
@@ -37,7 +37,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
class ComfoConnectFan(FanEntity):
"""Representation of the ComfoConnect fan platform."""
- def __init__(self, hass, name, ccb: ComfoConnectBridge):
+ def __init__(self, hass, name, ccb: ComfoConnectBridge) -> None:
"""Initialize the ComfoConnect fan."""
from pycomfoconnect import SENSOR_FAN_SPEED_MODE
@@ -93,7 +93,7 @@ class ComfoConnectFan(FanEntity):
speed = SPEED_LOW
self.set_speed(speed)
- def turn_off(self) -> None:
+ def turn_off(self, **kwargs) -> None:
"""Turn off the fan (to away)."""
self.set_speed(SPEED_OFF)
diff --git a/homeassistant/components/hdmi_cec.py b/homeassistant/components/hdmi_cec.py
index f94dd8816a7..8e2464d0922 100644
--- a/homeassistant/components/hdmi_cec.py
+++ b/homeassistant/components/hdmi_cec.py
@@ -320,7 +320,7 @@ def setup(hass: HomeAssistant, base_config):
class CecDevice(Entity):
"""Representation of a HDMI CEC device entity."""
- def __init__(self, hass: HomeAssistant, device, logical):
+ def __init__(self, hass: HomeAssistant, device, logical) -> None:
"""Initialize the device."""
self._device = device
self.hass = hass
diff --git a/homeassistant/components/ihc/ihcdevice.py b/homeassistant/components/ihc/ihcdevice.py
index 48827851f92..999dda42015 100644
--- a/homeassistant/components/ihc/ihcdevice.py
+++ b/homeassistant/components/ihc/ihcdevice.py
@@ -14,7 +14,7 @@ class IHCDevice(Entity):
"""
def __init__(self, ihc_controller, name, ihc_id: int, info: bool,
- product: Element=None):
+ product: Element=None) -> None:
"""Initialize IHC attributes."""
self.ihc_controller = ihc_controller
self._name = name
diff --git a/homeassistant/components/light/ihc.py b/homeassistant/components/light/ihc.py
index f23ae77c8b2..ead0f153562 100644
--- a/homeassistant/components/light/ihc.py
+++ b/homeassistant/components/light/ihc.py
@@ -64,7 +64,7 @@ class IhcLight(IHCDevice, Light):
"""
def __init__(self, ihc_controller, name, ihc_id: int, info: bool,
- dimmable=False, product: Element=None):
+ dimmable=False, product: Element=None) -> None:
"""Initialize the light."""
super().__init__(ihc_controller, name, ihc_id, info, product)
self._brightness = 0
diff --git a/homeassistant/components/light/tplink.py b/homeassistant/components/light/tplink.py
index 30ad3a4d268..6aee02ee914 100644
--- a/homeassistant/components/light/tplink.py
+++ b/homeassistant/components/light/tplink.py
@@ -75,7 +75,7 @@ def hsv_to_rgb(hsv: Tuple[float, float, float]) -> Tuple[int, int, int]:
class TPLinkSmartBulb(Light):
"""Representation of a TPLink Smart Bulb."""
- def __init__(self, smartbulb: 'SmartBulb', name):
+ def __init__(self, smartbulb: 'SmartBulb', name) -> None:
"""Initialize the bulb."""
self.smartbulb = smartbulb
self._name = name
diff --git a/homeassistant/components/media_player/hdmi_cec.py b/homeassistant/components/media_player/hdmi_cec.py
index 7054c83d36a..03e7c6f0c9f 100644
--- a/homeassistant/components/media_player/hdmi_cec.py
+++ b/homeassistant/components/media_player/hdmi_cec.py
@@ -34,7 +34,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
class CecPlayerDevice(CecDevice, MediaPlayerDevice):
"""Representation of a HDMI device as a Media palyer."""
- def __init__(self, hass: HomeAssistant, device, logical):
+ def __init__(self, hass: HomeAssistant, device, logical) -> None:
"""Initialize the HDMI device."""
CecDevice.__init__(self, hass, device, logical)
self.entity_id = "%s.%s_%s" % (
diff --git a/homeassistant/components/media_player/onkyo.py b/homeassistant/components/media_player/onkyo.py
index 97ebe5be92b..432d9ce108f 100644
--- a/homeassistant/components/media_player/onkyo.py
+++ b/homeassistant/components/media_player/onkyo.py
@@ -6,6 +6,9 @@ https://home-assistant.io/components/media_player.onkyo/
"""
import logging
+# pylint: disable=unused-import
+from typing import List # noqa: F401
+
import voluptuous as vol
from homeassistant.components.media_player import (
diff --git a/homeassistant/components/media_player/webostv.py b/homeassistant/components/media_player/webostv.py
index 55179ed60a9..fed442e140e 100644
--- a/homeassistant/components/media_player/webostv.py
+++ b/homeassistant/components/media_player/webostv.py
@@ -9,6 +9,9 @@ from datetime import timedelta
import logging
from urllib.parse import urlparse
+# pylint: disable=unused-import
+from typing import Dict # noqa: F401
+
import voluptuous as vol
from homeassistant.components.media_player import (
diff --git a/homeassistant/components/pilight.py b/homeassistant/components/pilight.py
index 3000820d28c..71e8232e8c2 100644
--- a/homeassistant/components/pilight.py
+++ b/homeassistant/components/pilight.py
@@ -130,7 +130,7 @@ class CallRateDelayThrottle(object):
it should not block the mainloop.
"""
- def __init__(self, hass, delay_seconds: float):
+ def __init__(self, hass, delay_seconds: float) -> None:
"""Initialize the delay handler."""
self._delay = timedelta(seconds=max(0.0, delay_seconds))
self._queue = []
diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py
index e19bcaaddfc..1adce50b1aa 100644
--- a/homeassistant/components/recorder/__init__.py
+++ b/homeassistant/components/recorder/__init__.py
@@ -16,7 +16,7 @@ import queue
import threading
import time
-from typing import Dict, Optional
+from typing import Any, Dict, Optional # noqa: F401
import voluptuous as vol
diff --git a/homeassistant/components/sensor/comfoconnect.py b/homeassistant/components/sensor/comfoconnect.py
index 9df28d861ee..ad6b07fb3da 100644
--- a/homeassistant/components/sensor/comfoconnect.py
+++ b/homeassistant/components/sensor/comfoconnect.py
@@ -96,7 +96,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
class ComfoConnectSensor(Entity):
"""Representation of a ComfoConnect sensor."""
- def __init__(self, hass, name, ccb: ComfoConnectBridge, sensor_type):
+ def __init__(self, hass, name, ccb: ComfoConnectBridge,
+ sensor_type) -> None:
"""Initialize the ComfoConnect sensor."""
self._ccb = ccb
self._sensor_type = sensor_type
diff --git a/homeassistant/components/sensor/daikin.py b/homeassistant/components/sensor/daikin.py
index ad571110e88..3ea3418db4e 100644
--- a/homeassistant/components/sensor/daikin.py
+++ b/homeassistant/components/sensor/daikin.py
@@ -57,7 +57,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
class DaikinClimateSensor(Entity):
"""Representation of a Sensor."""
- def __init__(self, api, monitored_state, units: UnitSystem, name=None):
+ def __init__(self, api, monitored_state, units: UnitSystem,
+ name=None) -> None:
"""Initialize the sensor."""
self._api = api
self._sensor = SENSOR_TYPES.get(monitored_state)
diff --git a/homeassistant/components/sensor/ihc.py b/homeassistant/components/sensor/ihc.py
index 3ad86e51f97..b6440a407a4 100644
--- a/homeassistant/components/sensor/ihc.py
+++ b/homeassistant/components/sensor/ihc.py
@@ -62,7 +62,7 @@ class IHCSensor(IHCDevice, Entity):
"""Implementation of the IHC sensor."""
def __init__(self, ihc_controller, name, ihc_id: int, info: bool,
- unit, product: Element=None):
+ unit, product: Element=None) -> None:
"""Initialize the IHC sensor."""
super().__init__(ihc_controller, name, ihc_id, info, product)
self._state = None
diff --git a/homeassistant/components/switch/hdmi_cec.py b/homeassistant/components/switch/hdmi_cec.py
index a100b582e64..65a7a762c0f 100644
--- a/homeassistant/components/switch/hdmi_cec.py
+++ b/homeassistant/components/switch/hdmi_cec.py
@@ -30,7 +30,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
class CecSwitchDevice(CecDevice, SwitchDevice):
"""Representation of a HDMI device as a Switch."""
- def __init__(self, hass: HomeAssistant, device, logical):
+ def __init__(self, hass: HomeAssistant, device, logical) -> None:
"""Initialize the HDMI device."""
CecDevice.__init__(self, hass, device, logical)
self.entity_id = "%s.%s_%s" % (
diff --git a/homeassistant/components/switch/ihc.py b/homeassistant/components/switch/ihc.py
index 4bab1378acd..eab88035c73 100644
--- a/homeassistant/components/switch/ihc.py
+++ b/homeassistant/components/switch/ihc.py
@@ -53,7 +53,7 @@ class IHCSwitch(IHCDevice, SwitchDevice):
"""IHC Switch."""
def __init__(self, ihc_controller, name: str, ihc_id: int,
- info: bool, product: Element=None):
+ info: bool, product: Element=None) -> None:
"""Initialize the IHC switch."""
super().__init__(ihc_controller, name, ihc_id, product)
self._state = False
diff --git a/homeassistant/loader.py b/homeassistant/loader.py
index 4b9eec3d540..a3ce2a13f56 100644
--- a/homeassistant/loader.py
+++ b/homeassistant/loader.py
@@ -19,7 +19,7 @@ import sys
from types import ModuleType
# pylint: disable=unused-import
-from typing import Dict, Optional, Sequence, Set # NOQA
+from typing import Dict, List, Optional, Sequence, Set # NOQA
from homeassistant.const import PLATFORM_FORMAT
from homeassistant.util import OrderedSet
diff --git a/homeassistant/util/dt.py b/homeassistant/util/dt.py
index 5e8b3382fb1..c3400bac9be 100644
--- a/homeassistant/util/dt.py
+++ b/homeassistant/util/dt.py
@@ -3,7 +3,7 @@ import datetime as dt
import re
# pylint: disable=unused-import
-from typing import Any, Union, Optional, Tuple # NOQA
+from typing import Any, Dict, Union, Optional, Tuple # NOQA
import pytz
diff --git a/homeassistant/util/unit_system.py b/homeassistant/util/unit_system.py
index 31b76365da4..ecef1087747 100644
--- a/homeassistant/util/unit_system.py
+++ b/homeassistant/util/unit_system.py
@@ -105,7 +105,7 @@ class UnitSystem(object):
raise TypeError('{} is not a numeric value.'.format(str(length)))
return distance_util.convert(length, from_unit,
- self.length_unit) # type: float
+ self.length_unit)
def as_dict(self) -> dict:
"""Convert the unit system to a dictionary."""
--
GitLab