From 6b6570e7ca3242a53b3a6117f1d4940f778ac5ed Mon Sep 17 00:00:00 2001
From: springstan <46536646+springstan@users.noreply.github.com>
Date: Mon, 9 Dec 2019 18:46:56 +0100
Subject: [PATCH] Move imports to top for ness_alarm (#29518)

* Move imports to top for ness_alarm

* Added patch for the ArminState in alarm_control_panel.py
---
 homeassistant/components/ness_alarm/__init__.py     |  2 +-
 .../components/ness_alarm/alarm_control_panel.py    |  3 ++-
 tests/components/ness_alarm/test_init.py            | 13 ++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/ness_alarm/__init__.py b/homeassistant/components/ness_alarm/__init__.py
index cc6fad1346d..7131ac505b5 100644
--- a/homeassistant/components/ness_alarm/__init__.py
+++ b/homeassistant/components/ness_alarm/__init__.py
@@ -3,6 +3,7 @@ from collections import namedtuple
 import datetime
 import logging
 
+from nessclient import ArmingState, Client
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import DEVICE_CLASSES
@@ -82,7 +83,6 @@ SERVICE_SCHEMA_AUX = vol.Schema(
 
 async def async_setup(hass, config):
     """Set up the Ness Alarm platform."""
-    from nessclient import Client, ArmingState
 
     conf = config[DOMAIN]
 
diff --git a/homeassistant/components/ness_alarm/alarm_control_panel.py b/homeassistant/components/ness_alarm/alarm_control_panel.py
index d2feebfb64f..f77244a584e 100644
--- a/homeassistant/components/ness_alarm/alarm_control_panel.py
+++ b/homeassistant/components/ness_alarm/alarm_control_panel.py
@@ -2,6 +2,8 @@
 
 import logging
 
+from nessclient import ArmingState
+
 import homeassistant.components.alarm_control_panel as alarm
 from homeassistant.components.alarm_control_panel.const import (
     SUPPORT_ALARM_ARM_AWAY,
@@ -91,7 +93,6 @@ class NessAlarmPanel(alarm.AlarmControlPanel):
     @callback
     def _handle_arming_state_change(self, arming_state):
         """Handle arming state update."""
-        from nessclient import ArmingState
 
         if arming_state == ArmingState.UNKNOWN:
             self._state = None
diff --git a/tests/components/ness_alarm/test_init.py b/tests/components/ness_alarm/test_init.py
index 31b173f9be6..9da361852e9 100644
--- a/tests/components/ness_alarm/test_init.py
+++ b/tests/components/ness_alarm/test_init.py
@@ -32,8 +32,6 @@ from homeassistant.const import (
 )
 from homeassistant.setup import async_setup_component
 
-from tests.common import MockDependency
-
 VALID_CONFIG = {
     DOMAIN: {
         CONF_HOST: "alarm.local",
@@ -262,7 +260,12 @@ def mock_nessclient():
     _mock_factory = MagicMock()
     _mock_factory.return_value = _mock_instance
 
-    with MockDependency("nessclient"), patch(
-        "nessclient.Client", new=_mock_factory, create=True
-    ), patch("nessclient.ArmingState", new=MockArmingState):
+    with patch(
+        "homeassistant.components.ness_alarm.Client", new=_mock_factory, create=True
+    ), patch(
+        "homeassistant.components.ness_alarm.ArmingState", new=MockArmingState
+    ), patch(
+        "homeassistant.components.ness_alarm.alarm_control_panel.ArmingState",
+        new=MockArmingState,
+    ):
         yield _mock_instance