Make imports relative

Author: brefra

plugwise/connections/__init__.py

@@ -4,8 +4,8 @@
 import threading
 import time
 
-from plugwise.constants import SLEEP_TIME
-from plugwise.messages import PlugwiseMessage
+from ..constants import SLEEP_TIME
+from ..messages.requests import NodeRequest
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -86,7 +86,7 @@ def _writer_daemon(self):
                     callback()
         _LOGGER.debug("Writer daemon stopped")
 
-    def send(self, message: PlugwiseMessage, callback=None):
+    def send(self, message: NodeRequest, callback=None):
         """Add message to write queue."""
         self._write_queue.put_nowait((message, callback))
 

plugwise/connections/serial.py

@@ -3,9 +3,9 @@
 
 import serial
 
-from plugwise.connections import StickConnection
-from plugwise.constants import BAUD_RATE, BYTE_SIZE, STOPBITS
-from plugwise.exceptions import PortError
+from ..connections import StickConnection
+from ..constants import BAUD_RATE, BYTE_SIZE, STOPBITS
+from ..exceptions import PortError
 
 _LOGGER = logging.getLogger(__name__)
 

plugwise/connections/socket.py

@@ -2,8 +2,8 @@
 import logging
 import socket
 
-from plugwise.connections import StickConnection
-from plugwise.exceptions import PortError
+from ..connections import StickConnection
+from ..exceptions import PortError
 
 _LOGGER = logging.getLogger(__name__)
 

plugwise/controller.py

@@ -6,9 +6,9 @@
 import threading
 import time
 
-from plugwise.connections.serial import PlugwiseUSBConnection
-from plugwise.connections.socket import SocketConnection
-from plugwise.constants import (
+from .connections.serial import PlugwiseUSBConnection
+from .connections.socket import SocketConnection
+from .constants import (
     MESSAGE_RETRY,
     MESSAGE_TIME_OUT,
     REQUEST_FAILED,
@@ -17,14 +17,14 @@
     STATUS_RESPONSES,
     UTF8_DECODE,
 )
-from plugwise.messages.requests import NodeInfoRequest, NodePingRequest, NodeRequest
-from plugwise.messages.responses import (
+from .messages.requests import NodeInfoRequest, NodePingRequest, NodeRequest
+from .messages.responses import (
     NodeAckLargeResponse,
     NodeAckResponse,
     NodeAckSmallResponse,
 )
-from plugwise.parser import PlugwiseParser
-from plugwise.util import inc_seq_id
+from .parser import PlugwiseParser
+from .util import inc_seq_id
 
 _LOGGER = logging.getLogger(__name__)
 

plugwise/messages/__init__.py

@@ -1,7 +1,7 @@
 """Plugwise messages."""
 
-from plugwise.constants import MESSAGE_FOOTER, MESSAGE_HEADER, UTF8_DECODE
-from plugwise.util import crc_fun
+from ..constants import MESSAGE_FOOTER, MESSAGE_HEADER, UTF8_DECODE
+from ..util import crc_fun
 
 
 class PlugwiseMessage:

plugwise/messages/requests.py

@@ -1,7 +1,7 @@
 """All known request messages to be send to plugwise devices."""
-from plugwise.constants import MESSAGE_FOOTER, MESSAGE_HEADER
-from plugwise.messages import PlugwiseMessage
-from plugwise.util import (
+from ..constants import MESSAGE_FOOTER, MESSAGE_HEADER
+from ..messages import PlugwiseMessage
+from ..util import (
     DateTime,
     Int,
     LogAddr,

plugwise/messages/responses.py

@@ -1,20 +1,20 @@
 """All known response messages to be received from plugwise devices."""
 from datetime import datetime
 
-from plugwise.constants import (
+from ..constants import (
     MESSAGE_FOOTER,
     MESSAGE_HEADER,
     MESSAGE_LARGE,
     MESSAGE_SMALL,
 )
-from plugwise.exceptions import (
+from ..exceptions import (
     InvalidMessageChecksum,
     InvalidMessageFooter,
     InvalidMessageHeader,
     InvalidMessageLength,
 )
-from plugwise.messages import PlugwiseMessage
-from plugwise.util import (
+from ..messages import PlugwiseMessage
+from ..util import (
     DateTime,
     Float,
     Int,

plugwise/nodes/__init__.py

@@ -2,27 +2,27 @@
 from datetime import datetime
 import logging
 
-from plugwise.constants import (
+from ..constants import (
     SENSOR_AVAILABLE,
     SENSOR_PING,
     SENSOR_RSSI_IN,
     SENSOR_RSSI_OUT,
     SWITCH_RELAY,
     UTF8_DECODE,
 )
-from plugwise.messages import PlugwiseMessage
-from plugwise.messages.requests import (
+from ..messages.requests import (
     NodeFeaturesRequest,
     NodeInfoRequest,
     NodePingRequest,
 )
-from plugwise.messages.responses import (
+from ..messages.responses import (
     NodeFeaturesResponse,
     NodeInfoResponse,
     NodeJoinAckResponse,
     NodePingResponse,
+    NodeResponse,
 )
-from plugwise.util import validate_mac, version_to_model
+from ..util import validate_mac, version_to_model
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -174,7 +174,7 @@ def ping(self, callback=None, sensor=True):
 
     def on_message(self, message):
         """Process received message."""
-        assert isinstance(message, PlugwiseMessage)
+        assert isinstance(message, NodeResponse)
         if message.mac == self.mac:
             if message.timestamp is not None:
                 _LOGGER.debug(

plugwise/nodes/circle.py

@@ -2,7 +2,7 @@
 from datetime import datetime, timedelta
 import logging
 
-from plugwise.constants import (
+from ..constants import (
     HA_SENSOR,
     HA_SWITCH,
     MAX_TIME_DRIFT,
@@ -22,22 +22,22 @@
     SENSOR_RSSI_OUT,
     SWITCH_RELAY,
 )
-from plugwise.messages.requests import (
+from ..messages.requests import (
     CircleCalibrationRequest,
     CircleClockGetRequest,
     CircleClockSetRequest,
     CirclePowerBufferRequest,
     CirclePowerUsageRequest,
     CircleSwitchRelayRequest,
 )
-from plugwise.messages.responses import (
+from ..messages.responses import (
     CircleCalibrationResponse,
     CircleClockResponse,
     CirclePowerBufferResponse,
     CirclePowerUsageResponse,
     NodeAckLargeResponse,
 )
-from plugwise.nodes import PlugwiseNode
+from ..nodes import PlugwiseNode
 
 _LOGGER = logging.getLogger(__name__)
 

plugwise/nodes/circle_plus.py

@@ -2,17 +2,17 @@
 from datetime import datetime
 import logging
 
-from plugwise.constants import MAX_TIME_DRIFT, UTF8_DECODE
-from plugwise.messages.requests import (
+from ..constants import MAX_TIME_DRIFT, UTF8_DECODE
+from ..messages.requests import (
     CirclePlusRealTimeClockGetRequest,
     CirclePlusRealTimeClockSetRequest,
     CirclePlusScanRequest,
 )
-from plugwise.messages.responses import (
+from ..messages.responses import (
     CirclePlusRealTimeClockResponse,
     CirclePlusScanResponse,
 )
-from plugwise.nodes.circle import PlugwiseCircle
+from ..nodes.circle import PlugwiseCircle
 
 _LOGGER = logging.getLogger(__name__)