From 72f336a2ddfaf7dc6af65b6604af892c20bb284c Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Mon, 9 Dec 2019 16:10:02 +0100
Subject: [PATCH] Move imports to top for homekit (#29560)

* Move imports to top for homekit

* Moved back a couple imports, added annotation to disable import-outside-toplevel

* Fix all tests in test_homekit.py
---
 homeassistant/components/homekit/__init__.py |  4 ++--
 tests/components/homekit/test_homekit.py     | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py
index cfd59ad61a4..9a2b2d5a851 100644
--- a/homeassistant/components/homekit/__init__.py
+++ b/homeassistant/components/homekit/__init__.py
@@ -29,6 +29,7 @@ from homeassistant.helpers.entityfilter import FILTER_SCHEMA
 from homeassistant.util import get_local_ip
 from homeassistant.util.decorator import Registry
 
+from .accessories import HomeBridge, HomeDriver
 from .const import (
     BRIDGE_NAME,
     CONF_ADVERTISE_IP,
@@ -302,7 +303,6 @@ class HomeKit:
 
     def setup(self):
         """Set up bridge and accessory driver."""
-        from .accessories import HomeBridge, HomeDriver
 
         self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self.stop)
 
@@ -361,7 +361,7 @@ class HomeKit:
             return
         self.status = STATUS_WAIT
 
-        from . import (  # noqa: F401 pylint: disable=unused-import
+        from . import (  # noqa: F401 pylint: disable=unused-import, import-outside-toplevel
             type_covers,
             type_fans,
             type_lights,
diff --git a/tests/components/homekit/test_homekit.py b/tests/components/homekit/test_homekit.py
index de6aaf0f11e..c845370e278 100644
--- a/tests/components/homekit/test_homekit.py
+++ b/tests/components/homekit/test_homekit.py
@@ -126,7 +126,7 @@ async def test_homekit_setup(hass, hk_driver):
     homekit = HomeKit(hass, BRIDGE_NAME, DEFAULT_PORT, None, {}, {}, DEFAULT_SAFE_MODE)
 
     with patch(
-        PATH_HOMEKIT + ".accessories.HomeDriver", return_value=hk_driver
+        PATH_HOMEKIT + ".HomeDriver", return_value=hk_driver
     ) as mock_driver, patch("homeassistant.util.get_local_ip") as mock_ip:
         mock_ip.return_value = IP_ADDRESS
         await hass.async_add_job(homekit.setup)
@@ -150,9 +150,7 @@ async def test_homekit_setup_ip_address(hass, hk_driver):
     """Test setup with given IP address."""
     homekit = HomeKit(hass, BRIDGE_NAME, DEFAULT_PORT, "172.0.0.0", {}, {}, None)
 
-    with patch(
-        PATH_HOMEKIT + ".accessories.HomeDriver", return_value=hk_driver
-    ) as mock_driver:
+    with patch(PATH_HOMEKIT + ".HomeDriver", return_value=hk_driver) as mock_driver:
         await hass.async_add_job(homekit.setup)
     mock_driver.assert_called_with(
         hass,
@@ -169,9 +167,7 @@ async def test_homekit_setup_advertise_ip(hass, hk_driver):
         hass, BRIDGE_NAME, DEFAULT_PORT, "0.0.0.0", {}, {}, None, "192.168.1.100"
     )
 
-    with patch(
-        PATH_HOMEKIT + ".accessories.HomeDriver", return_value=hk_driver
-    ) as mock_driver:
+    with patch(PATH_HOMEKIT + ".HomeDriver", return_value=hk_driver) as mock_driver:
         await hass.async_add_job(homekit.setup)
     mock_driver.assert_called_with(
         hass,
@@ -186,7 +182,7 @@ async def test_homekit_setup_safe_mode(hass, hk_driver):
     """Test if safe_mode flag is set."""
     homekit = HomeKit(hass, BRIDGE_NAME, DEFAULT_PORT, None, {}, {}, True)
 
-    with patch(PATH_HOMEKIT + ".accessories.HomeDriver", return_value=hk_driver):
+    with patch(PATH_HOMEKIT + ".HomeDriver", return_value=hk_driver):
         await hass.async_add_job(homekit.setup)
     assert homekit.driver.safe_mode is True