From 1af5d2096d454a86ce052e794c9f0e8410735505 Mon Sep 17 00:00:00 2001
From: Rob Coleman <rccoleman@gmail.com>
Date: Thu, 17 Dec 2020 10:11:41 -0800
Subject: [PATCH] Fix merge

---
 custom_components/lamarzocco/__init__.py    | 17 +++++++---------
 custom_components/lamarzocco/api.py         | 22 ++++++++++-----------
 custom_components/lamarzocco/config_flow.py | 20 +++++++------------
 custom_components/lamarzocco/switch.py      | 18 +++++++++--------
 4 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/custom_components/lamarzocco/__init__.py b/custom_components/lamarzocco/__init__.py
index 670120e..2b42f0b 100644
--- a/custom_components/lamarzocco/__init__.py
+++ b/custom_components/lamarzocco/__init__.py
@@ -1,19 +1,16 @@
 """The La Marzocco integration."""
 
-from .const import DOMAIN
-from .api import LaMarzocco
+import asyncio
+import logging
+from datetime import timedelta
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.core import HomeAssistant
-from datetime import timedelta
-
-import logging, asyncio
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from homeassistant.helpers.update_coordinator import (
-    DataUpdateCoordinator,
-    UpdateFailed,
-)
+from .api import LaMarzocco
+from .const import DOMAIN
 
 SCAN_INTERVAL = timedelta(minutes=10)
 _LOGGER = logging.getLogger(__name__)
diff --git a/custom_components/lamarzocco/api.py b/custom_components/lamarzocco/api.py
index 9e3a51c..ed4f783 100644
--- a/custom_components/lamarzocco/api.py
+++ b/custom_components/lamarzocco/api.py
@@ -1,22 +1,20 @@
+import logging
+
+from authlib.integrations.base_client.errors import OAuthError
+from authlib.integrations.httpx_client import AsyncOAuth2Client
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
+from lmdirect import LMDirect
+
 from .const import (
     COMMAND_ON,
     COMMAND_STANDBY,
-    CONF_SERIAL_NUMBER,
     CONF_CLIENT_ID,
     CONF_CLIENT_SECRET,
+    CONF_SERIAL_NUMBER,
+    CUSTOMER_URL,
     GW_URL,
     TOKEN_URL,
-    CUSTOMER_URL,
 )
-from authlib.integrations.httpx_client import AsyncOAuth2Client
-from authlib.integrations.base_client.errors import OAuthError
-from homeassistant.const import (
-    CONF_HOST,
-    CONF_USERNAME,
-    CONF_PASSWORD,
-)
-from lmdirect import LMDirect
-import logging
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -89,4 +87,4 @@ async def power(self, power):
 
 
 class AuthFail(BaseException):
-    """Error to indicate there is invalid auth."""
\ No newline at end of file
+    """Error to indicate there is invalid auth."""
diff --git a/custom_components/lamarzocco/config_flow.py b/custom_components/lamarzocco/config_flow.py
index af5ec58..61d4e1a 100644
--- a/custom_components/lamarzocco/config_flow.py
+++ b/custom_components/lamarzocco/config_flow.py
@@ -1,27 +1,21 @@
 """Config flow for La Marzocco integration."""
 import logging
 from typing import Any, Dict, Optional
-from authlib.integrations.base_client.errors import OAuthError
+
 import voluptuous as vol
+from authlib.integrations.base_client.errors import OAuthError
 from homeassistant import config_entries, core, exceptions
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
-from homeassistant.helpers import config_validation as cv
-
 from homeassistant.const import (
-    CONF_USERNAME,
-    CONF_PASSWORD,
+    CONF_HOST,
     CONF_NAME,
+    CONF_PASSWORD,
     CONF_TYPE,
-    CONF_HOST,
+    CONF_USERNAME,
 )
+from homeassistant.helpers import config_validation as cv
 
-from .const import (
-    CONF_CLIENT_ID,
-    CONF_CLIENT_SECRET,
-    CONF_SERIAL_NUMBER,
-    DOMAIN,
-)
 from .api import LaMarzocco
+from .const import CONF_CLIENT_ID, CONF_CLIENT_SECRET, CONF_SERIAL_NUMBER, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/custom_components/lamarzocco/switch.py b/custom_components/lamarzocco/switch.py
index ecabd70..b1df5f9 100644
--- a/custom_components/lamarzocco/switch.py
+++ b/custom_components/lamarzocco/switch.py
@@ -1,20 +1,22 @@
+import logging
+from typing import Dict
+
+from homeassistant.components.switch import SwitchEntity
+from homeassistant.core import callback
+from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
 from .const import (
     ATTR_STATUS_MAP,
     ATTRIBUTION,
     CONF_SERIAL_NUMBER,
     DEFAULT_NAME,
+    DEVICE_MAP,
+    DOMAIN,
     STATUS_MACHINE_STATUS,
     TEMP_KEYS,
 )
 
-from typing import Dict
-import logging
-
-from homeassistant.components.switch import SwitchEntity
-from homeassistant.helpers.restore_state import RestoreEntity
-from homeassistant.core import callback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
 _LOGGER = logging.getLogger(__name__)