Upgrade mypy to 0.800

homeassistant/core.py

@@ -205,7 +205,7 @@ class CoreState(enum.Enum):
 
     def __str__(self) -> str:  # pylint: disable=invalid-str-returned
         """Return the event."""
-        return self.value  # type: ignore
+        return self.value
 
 
 class HomeAssistant:
@@ -584,7 +584,7 @@ class EventOrigin(enum.Enum):
 
     def __str__(self) -> str:  # pylint: disable=invalid-str-returned
         """Return the event."""
-        return self.value  # type: ignore
+        return self.value
 
 
 class Event:

homeassistant/helpers/event.py

@@ -116,7 +116,9 @@ class TrackTemplateResult:
     result: Any
 
 
-def threaded_listener_factory(async_factory: Callable[..., Any]) -> CALLBACK_TYPE:
+def threaded_listener_factory(
+    async_factory: Callable[..., Any]
+) -> Callable[..., CALLBACK_TYPE]:
     """Convert an async event helper to a threaded one."""
 
     @ft.wraps(async_factory)

homeassistant/helpers/location.py

@@ -18,9 +18,8 @@ def has_location(state: State) -> bool:
 
     Async friendly.
     """
-    # type ignore: https://github.com/python/mypy/issues/7207
     return (
-        isinstance(state, State)  # type: ignore
+        isinstance(state, State)
         and isinstance(state.attributes.get(ATTR_LATITUDE), float)
         and isinstance(state.attributes.get(ATTR_LONGITUDE), float)
     )

homeassistant/util/logging.py

@@ -6,7 +6,7 @@
 import logging.handlers
 import queue
 import traceback
-from typing import Any, Callable, Coroutine
+from typing import Any, Callable, Coroutine, Union
 
 from homeassistant.const import EVENT_HOMEASSISTANT_CLOSE
 from homeassistant.core import HomeAssistant, callback
@@ -108,15 +108,15 @@ def log_exception(format_err: Callable[..., Any], *args: Any) -> None:
 
 def catch_log_exception(
     func: Callable[..., Any], format_err: Callable[..., Any], *args: Any
-) -> Callable[[], None]:
+) -> Union[Callable[..., None], Callable[..., Coroutine[Any, Any, None]]]:
     """Decorate a callback to catch and log exceptions."""
 
     # Check for partials to properly determine if coroutine function
     check_func = func
     while isinstance(check_func, partial):
         check_func = check_func.func
 
-    wrapper_func = None
+    wrapper_func: Union[Callable[..., None], Callable[..., Coroutine[Any, Any, None]]]
     if asyncio.iscoroutinefunction(check_func):
 
         @wraps(func)

requirements_test.txt

@@ -8,7 +8,7 @@ codecov==2.1.10
 coverage==5.3
 jsonpickle==1.4.1
 mock-open==1.4.0
-mypy==0.790
+mypy==0.800
 pre-commit==2.9.3
 pylint==2.6.0
 astroid==2.4.2