From fbde347e6490292549fffdfe374561501dff633f Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Wed, 3 Aug 2022 13:24:55 -0600 Subject: [PATCH] Move RainMachine utils to the correct location (#76051) * Move RainMachine utils to the correct location * Imports --- homeassistant/components/rainmachine/const.py | 17 ----------------- homeassistant/components/rainmachine/sensor.py | 4 +--- homeassistant/components/rainmachine/switch.py | 2 +- homeassistant/components/rainmachine/util.py | 17 +++++++++++++++++ 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/homeassistant/components/rainmachine/const.py b/homeassistant/components/rainmachine/const.py index f386341c161..56c1660a0ba 100644 --- a/homeassistant/components/rainmachine/const.py +++ b/homeassistant/components/rainmachine/const.py @@ -1,8 +1,6 @@ """Define constants for the SimpliSafe component.""" import logging -from homeassistant.backports.enum import StrEnum - LOGGER = logging.getLogger(__package__) DOMAIN = "rainmachine" @@ -19,18 +17,3 @@ DATA_ZONES = "zones" DEFAULT_PORT = 8080 DEFAULT_ZONE_RUN = 60 * 10 - - -class RunStates(StrEnum): - """Define an enum for program/zone run states.""" - - NOT_RUNNING = "Not Running" - QUEUED = "Queued" - RUNNING = "Running" - - -RUN_STATE_MAP = { - 0: RunStates.NOT_RUNNING, - 1: RunStates.RUNNING, - 2: RunStates.QUEUED, -} diff --git a/homeassistant/components/rainmachine/sensor.py b/homeassistant/components/rainmachine/sensor.py index e57386fe0ec..797420b460f 100644 --- a/homeassistant/components/rainmachine/sensor.py +++ b/homeassistant/components/rainmachine/sensor.py @@ -31,14 +31,12 @@ from .const import ( DATA_RESTRICTIONS_UNIVERSAL, DATA_ZONES, DOMAIN, - RUN_STATE_MAP, - RunStates, ) from .model import ( RainMachineDescriptionMixinApiCategory, RainMachineDescriptionMixinUid, ) -from .util import key_exists +from .util import RUN_STATE_MAP, RunStates, key_exists DEFAULT_ZONE_COMPLETION_TIME_WOBBLE_TOLERANCE = timedelta(seconds=5) diff --git a/homeassistant/components/rainmachine/switch.py b/homeassistant/components/rainmachine/switch.py index aa91f529b5b..1fcdab49836 100644 --- a/homeassistant/components/rainmachine/switch.py +++ b/homeassistant/components/rainmachine/switch.py @@ -30,9 +30,9 @@ from .const import ( DATA_ZONES, DEFAULT_ZONE_RUN, DOMAIN, - RUN_STATE_MAP, ) from .model import RainMachineDescriptionMixinUid +from .util import RUN_STATE_MAP ATTR_AREA = "area" ATTR_CS_ON = "cs_on" diff --git a/homeassistant/components/rainmachine/util.py b/homeassistant/components/rainmachine/util.py index 27a0636688e..6bf15f2fb9c 100644 --- a/homeassistant/components/rainmachine/util.py +++ b/homeassistant/components/rainmachine/util.py @@ -3,6 +3,23 @@ from __future__ import annotations from typing import Any +from homeassistant.backports.enum import StrEnum + + +class RunStates(StrEnum): + """Define an enum for program/zone run states.""" + + NOT_RUNNING = "Not Running" + QUEUED = "Queued" + RUNNING = "Running" + + +RUN_STATE_MAP = { + 0: RunStates.NOT_RUNNING, + 1: RunStates.RUNNING, + 2: RunStates.QUEUED, +} + def key_exists(data: dict[str, Any], search_key: str) -> bool: """Return whether a key exists in a nested dict."""