Merge commit 'refs/pull/857/head' of github.com:meshtastic/python into tmp/merge-918-857

meshtastic/serial_interface.py

@@ -35,8 +35,6 @@ class SerialInterface(StreamInterface):
             debugOut {stream} -- If a stream is provided, any debug serial output from the device will be emitted to that stream. (default: {None})
             timeout -- How long to wait for replies (default: 300 seconds)
         """
-        self.noProto = noProto
-
         self.devPath: Optional[str] = devPath
 
         if self.devPath is None:
@@ -52,6 +50,11 @@ class SerialInterface(StreamInterface):
             else:
                 self.devPath = ports[0]
 
+        StreamInterface.__init__(
+            self, debugOut=debugOut, noProto=noProto, connectNow=connectNow, noNodes=noNodes, timeout=timeout
+        )
+
+    def connect(self) -> None:
         logger.debug(f"Connecting to {self.devPath}")
 
         if sys.platform != "win32":
@@ -65,9 +68,7 @@ class SerialInterface(StreamInterface):
         self.stream.flush()	# type: ignore[attr-defined]
         time.sleep(0.1)
 
-        StreamInterface.__init__(
-            self, debugOut=debugOut, noProto=noProto, connectNow=connectNow, noNodes=noNodes, timeout=timeout
-        )
+        super().connect()
 
     def _set_hupcl_with_termios(self, f: TextIOWrapper):
         """first we need to set the HUPCL so the device will not reboot based on RTS and/or DTR

meshtastic/stream_interface.py

@@ -40,15 +40,14 @@ class StreamInterface(MeshInterface):
             timeout -- How long to wait for replies (default: 300 seconds)
 
         Raises:
-            Exception: [description]
-            Exception: [description]
+            RuntimeError: Raised if StreamInterface is instantiated when noProto is false.
         """
 
-        if not hasattr(self, "stream") and not noProto:
-            raise Exception( # pylint: disable=W0719
+        if not noProto and type(self) == StreamInterface: # pylint: disable=C0123
+            raise RuntimeError(
                 "StreamInterface is now abstract (to update existing code create SerialInterface instead)"
             )
-        self.stream: Optional[serial.Serial] # only serial uses this, TCPInterface overrides the relevant methods instead
+        self.stream: Optional[serial.Serial] = None  # only serial uses this, TCPInterface overrides the relevant methods instead
         self._rxBuf = bytes()  # empty
         self._wantExit = False
 

meshtastic/tcp_interface.py

@@ -31,19 +31,11 @@ class TCPInterface(StreamInterface):
             hostname {string} -- Hostname/IP address of the device to connect to
             timeout -- How long to wait for replies (default: 300 seconds)
         """
-
-        self.stream = None
-
         self.hostname: str = hostname
         self.portNumber: int = portNumber
 
         self.socket: Optional[socket.socket] = None
 
-        if connectNow:
-            self.myConnect()
-        else:
-            self.socket = None
-
         super().__init__(debugOut=debugOut, noProto=noProto, connectNow=connectNow, noNodes=noNodes, timeout=timeout)
 
     def __repr__(self):
@@ -68,8 +60,13 @@ class TCPInterface(StreamInterface):
         if self.socket is not None:
             self.socket.shutdown(socket.SHUT_RDWR)
 
+    def connect(self) -> None:
+        """Connect the interface"""
+        self.myConnect()
+        super().connect()
+
     def myConnect(self) -> None:
-        """Connect to socket"""
+        """Connect to socket (without attempting to start the interface's receive thread"""
         logger.debug(f"Connecting to {self.hostname}") # type: ignore[str-bytes-safe]
         server_address = (self.hostname, self.portNumber)
         self.socket = socket.create_connection(server_address)

meshtastic/tests/test_stream_interface.py

@@ -15,7 +15,7 @@ def test_StreamInterface():
     """Test that we cannot instantiate a StreamInterface based on noProto"""
     with pytest.raises(Exception) as pytest_wrapped_e:
         StreamInterface()
-    assert pytest_wrapped_e.type == Exception
+    assert pytest_wrapped_e.type == RuntimeError
 
 
 @pytest.mark.unit