made imports more specific

signalkraft · Feb 23, 2024 · 90ca073 · 90ca073
1 parent 0d66f37
commit 90ca073
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 16 deletions.
diff --git a/custom_components/mypyllant/datetime.py b/custom_components/mypyllant/datetime.py
@@ -8,7 +8,8 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from custom_components.mypyllant import DOMAIN, SystemCoordinator
+from custom_components.mypyllant.const import DOMAIN
+from custom_components.mypyllant.coordinator import SystemCoordinator
 from custom_components.mypyllant.utils import HolidayEntity, EntityList
 from myPyllant.utils import get_default_holiday_dates
 

diff --git a/custom_components/mypyllant/number.py b/custom_components/mypyllant/number.py
@@ -9,7 +9,8 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from custom_components.mypyllant import DOMAIN, SystemCoordinator
+from custom_components.mypyllant.const import DOMAIN
+from custom_components.mypyllant.coordinator import SystemCoordinator
 from custom_components.mypyllant.utils import (
     HolidayEntity,
     SystemCoordinatorEntity,

diff --git a/custom_components/mypyllant/switch.py b/custom_components/mypyllant/switch.py
@@ -7,7 +7,8 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from custom_components.mypyllant import DOMAIN, SystemCoordinator
+from custom_components.mypyllant.const import DOMAIN
+from custom_components.mypyllant.coordinator import SystemCoordinator
 from custom_components.mypyllant.utils import (
     HolidayEntity,
     DomesticHotWaterCoordinatorEntity,

diff --git a/custom_components/mypyllant/utils.py b/custom_components/mypyllant/utils.py
@@ -15,7 +15,7 @@
 from myPyllant.const import DEFAULT_HOLIDAY_DURATION
 
 if typing.TYPE_CHECKING:
-    from custom_components.mypyllant import SystemCoordinator
+    from custom_components.mypyllant.coordinator import SystemCoordinator
     from myPyllant.models import System, DomesticHotWater, Zone
 
 logger = logging.getLogger(__name__)

diff --git a/custom_components/mypyllant/ventilation_climate.py b/custom_components/mypyllant/ventilation_climate.py
@@ -16,7 +16,8 @@
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from custom_components.mypyllant import SystemCoordinator, DOMAIN
+from custom_components.mypyllant.const import DOMAIN
+from custom_components.mypyllant.coordinator import SystemCoordinator
 from myPyllant.enums import VentilationOperationMode, VentilationFanStageType
 from myPyllant.models import System, Ventilation
 

diff --git a/tests/test_calendar.py b/tests/test_calendar.py
@@ -6,7 +6,7 @@
 from homeassistant.helpers.entity_registry import DATA_REGISTRY, EntityRegistry
 from homeassistant.loader import DATA_COMPONENTS, DATA_INTEGRATIONS
 
-from custom_components.mypyllant import DOMAIN
+from custom_components.mypyllant.const import DOMAIN
 from myPyllant.api import MyPyllantAPI
 from myPyllant.tests.utils import list_test_data
 

diff --git a/tests/test_climate.py b/tests/test_climate.py
@@ -10,7 +10,8 @@
 from myPyllant.api import MyPyllantAPI
 from myPyllant.tests.utils import list_test_data
 
-from custom_components.mypyllant import SystemCoordinator, DOMAIN
+from custom_components.mypyllant.const import DOMAIN
+from custom_components.mypyllant.coordinator import SystemCoordinator
 from custom_components.mypyllant.climate import (
     ZoneClimate,
     async_setup_entry,

diff --git a/tests/test_init.py b/tests/test_init.py
@@ -11,13 +11,13 @@
 from myPyllant.api import MyPyllantAPI
 from myPyllant.tests.utils import list_test_data
 
-from custom_components.mypyllant import DOMAIN, async_setup_entry, async_unload_entry
+from custom_components.mypyllant.const import DOMAIN
+from custom_components.mypyllant import async_setup_entry, async_unload_entry
 from custom_components.mypyllant.config_flow import DATA_SCHEMA
 from tests.conftest import TEST_OPTIONS, MockConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 
-
 test_user_input = {
     "username": "username",
     "password": "password",

diff --git a/tests/test_services.py b/tests/test_services.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from custom_components.mypyllant import (
+from custom_components.mypyllant.const import (
     SERVICE_GENERATE_TEST_DATA,
     SERVICE_EXPORT,
 )

diff --git a/tests/test_water_heater.py b/tests/test_water_heater.py
@@ -5,7 +5,7 @@
 from homeassistant.helpers.entity_registry import DATA_REGISTRY, EntityRegistry
 from homeassistant.loader import DATA_COMPONENTS, DATA_INTEGRATIONS
 
-from custom_components.mypyllant import DOMAIN
+from custom_components.mypyllant.const import DOMAIN
 from myPyllant.api import MyPyllantAPI
 from myPyllant.enums import DHWOperationMode
 from myPyllant.tests.utils import list_test_data

diff --git a/tests/utils.py b/tests/utils.py
@@ -1,10 +1,7 @@
 from unittest import mock
 
-
-from custom_components.mypyllant import (
-    DOMAIN,
-    async_setup_entry,
-)
+from custom_components.mypyllant.const import DOMAIN
+from custom_components.mypyllant import async_setup_entry
 from tests.conftest import MockConfigEntry, TEST_OPTIONS
 from tests.test_init import test_user_input