Clean up import handling

Author: jmattsson

scripts/run-tests.sh

@@ -11,7 +11,7 @@ extra=
 [ -z "$@" ] && extra="--cov-fail-under=100"
 
 echo "Linting tests..."
-mypy --ignore-missing-imports "${testsdir}"
+mypy "${testsdir}"
 
 pytest \
   --cov=powersensor_local.xlatemsg \

src/powersensor_local/devices.py

@@ -5,14 +5,9 @@
 
 from datetime import datetime, timezone
 from enum import Enum
-from pathlib import Path
-PROJECT_ROOT = str(Path(__file__).parents[1])
-if PROJECT_ROOT not in sys.path:
-    sys.path.append(PROJECT_ROOT)
-
-# pylint: disable=C0413
-from powersensor_local.legacy_discovery import LegacyDiscovery
-from powersensor_local.plug_api import PlugApi
+
+from .legacy_discovery import LegacyDiscovery
+from .plug_api import PlugApi
 
 EXPIRY_CHECK_INTERVAL_S = 30
 EXPIRY_TIMEOUT_S = 5 * 60

src/powersensor_local/events.py

@@ -5,13 +5,7 @@
 interface in devices.py rather than parsing the output from this script."""
 import typing
 import sys
-from pathlib import Path
 
-PROJECT_ROOT = str(Path(__file__).parents[1])
-if PROJECT_ROOT not in sys.path:
-    sys.path.append(PROJECT_ROOT)
-
-# pylint: disable=C0413
 from powersensor_local.devices import PowersensorDevices
 from powersensor_local.abstract_event_handler import AbstractEventHandler
 

src/powersensor_local/plug_api.py

@@ -1,15 +1,10 @@
 """Interface abstraction for Powersensor plugs."""
 import sys
-from pathlib import Path
-PROJECT_ROOT = str(Path(__file__).parents[1])
-if PROJECT_ROOT not in sys.path:
-    sys.path.append(PROJECT_ROOT)
-
-# pylint: disable=C0413
-from powersensor_local.async_event_emitter import AsyncEventEmitter
-from powersensor_local.plug_listener_tcp import PlugListenerTcp
-from powersensor_local.plug_listener_udp import PlugListenerUdp
-from powersensor_local.xlatemsg import translate_raw_message
+
+from .async_event_emitter import AsyncEventEmitter
+from .plug_listener_tcp import PlugListenerTcp
+from .plug_listener_udp import PlugListenerUdp
+from .xlatemsg import translate_raw_message
 
 class PlugApi(AsyncEventEmitter):
     """

src/powersensor_local/plug_listener_tcp.py

@@ -1,14 +1,8 @@
 """Internal helper for accessing the event stream from a Powersensor plug."""
 import asyncio
 import json
-
 import sys
-from pathlib import Path
-PROJECT_ROOT = str(Path(__file__).parents[1])
-if PROJECT_ROOT not in sys.path:
-    sys.path.append(PROJECT_ROOT)
 
-# pylint: disable=C0413
 from powersensor_local.async_event_emitter import AsyncEventEmitter
 
 class PlugListenerTcp(AsyncEventEmitter):

src/powersensor_local/plug_listener_udp.py

@@ -4,12 +4,6 @@
 import socket
 import sys
 
-from pathlib import Path
-PROJECT_ROOT = str(Path(__file__).parents[1])
-if PROJECT_ROOT not in sys.path:
-    sys.path.append(PROJECT_ROOT)
-
-# pylint: disable=C0413
 from powersensor_local.async_event_emitter import AsyncEventEmitter
 
 # pylint: disable=R0902

src/powersensor_local/virtual_household.py

@@ -1,17 +1,11 @@
 """Abstraction for producing a household view."""
 
 import sys
-from pathlib import Path
 from dataclasses import dataclass
 from typing import Optional
 
-PROJECT_ROOT = str(Path(__file__).parents[1])
-if PROJECT_ROOT not in sys.path:
-    sys.path.append(PROJECT_ROOT)
-
-# pylint: disable=C0413
-from powersensor_local.async_event_emitter import AsyncEventEmitter
-from powersensor_local.event_buffer import EventBuffer
+from .async_event_emitter import AsyncEventEmitter
+from .event_buffer import EventBuffer
 
 KEY_DUR_S = 'duration_s'
 KEY_RESET = 'summation_resettime_utc'

src/powersensor_local/zeroconf_devices.py

@@ -57,14 +57,9 @@
 import asyncio
 import logging
 import sys
-from pathlib import Path
 from typing import Any
 
-PROJECT_ROOT = str(Path(__file__).parents[1])
-if PROJECT_ROOT not in sys.path:
-    sys.path.append(PROJECT_ROOT)
-
-from powersensor_local.devices import _PowersensorDevicesBase, _LogLevel
+from .devices import _PowersensorDevicesBase, _LogLevel
 
 _SERVICE_TYPE_UDP = '_powersensor._udp.local.'
 _SERVICE_TYPE_TCP = '_powersensor._tcp.local.'