tweak imports

zxdavb · Jun 29, 2024 · ec79b23 · ec79b23
1 parent 4efd666
commit ec79b23
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/src/evohomeasync2/client.py b/src/evohomeasync2/client.py
@@ -16,7 +16,7 @@
 from .base import EvohomeClient
 from .const import SZ_NAME, SZ_SCHEDULE
 from .controlsystem import ControlSystem
-from .schema.account import SZ_ACCESS_TOKEN, SZ_ACCESS_TOKEN_EXPIRES, SZ_REFRESH_TOKEN
+from .schema import SZ_ACCESS_TOKEN, SZ_ACCESS_TOKEN_EXPIRES, SZ_REFRESH_TOKEN
 
 # debug flags should be False for end-users
 _DEBUG_CLI = False  # for debugging of CLI (*before* loading library)

diff --git a/src/evohomeasync2/hotwater.py b/src/evohomeasync2/hotwater.py
@@ -10,7 +10,7 @@
 
 from . import exceptions as exc
 from .const import API_STRFTIME
-from .schema import SCH_DHW_STATUS
+from .schema import SCH_DHW_STATUS, SCH_GET_SCHEDULE_DHW, SCH_PUT_SCHEDULE_DHW
 from .schema.const import (
     SZ_ALLOWED_MODES,
     SZ_DHW_ID,
@@ -24,7 +24,6 @@
     DhwState,
     ZoneMode,
 )
-from .schema.schedule import SCH_GET_SCHEDULE_DHW, SCH_PUT_SCHEDULE_DHW
 from .zone import _ZoneBase
 
 if TYPE_CHECKING:

diff --git a/src/evohomeasync2/schema/__init__.py b/src/evohomeasync2/schema/__init__.py
@@ -25,8 +25,14 @@
 )
 from .schedule import (  # noqa: F401
     SCH_GET_SCHEDULE,
+    SCH_GET_SCHEDULE_DHW,
+    SCH_GET_SCHEDULE_ZONE,
     SCH_PUT_SCHEDULE,
+    SCH_PUT_SCHEDULE_DHW,
+    SCH_PUT_SCHEDULE_ZONE,
+    _TcsSchedulesT,
     convert_to_get_schedule,
+    convert_to_put_schedule,
 )
 from .status import (  # noqa: F401
     SCH_DHW as SCH_DHW_STATUS,

diff --git a/src/evohomeasync2/zone.py b/src/evohomeasync2/zone.py
@@ -15,7 +15,12 @@
 
 from . import exceptions as exc
 from .const import API_STRFTIME, ZoneMode
-from .schema import SCH_ZONE_STATUS
+from .schema import (
+    SCH_GET_SCHEDULE_ZONE,
+    SCH_PUT_SCHEDULE_ZONE,
+    SCH_ZONE_STATUS,
+    convert_to_put_schedule,
+)
 from .schema.const import (
     SZ_ACTIVE_FAULTS,
     SZ_ALLOWED_SETPOINT_MODES,
@@ -44,11 +49,6 @@
     ZoneModelType,
     ZoneType,
 )
-from .schema.schedule import (
-    SCH_GET_SCHEDULE_ZONE,
-    SCH_PUT_SCHEDULE_ZONE,
-    convert_to_put_schedule,
-)
 
 if TYPE_CHECKING:
     import logging