ConsoleProtocol: Update Signatures to match ConsoleExpectMixin

The ConsoleExpectMixin has learned some new tricks over time.
But the ConsoleProtocol was not updated accordingly.

Every class implementing the ConsoleProtocol also uses the
ConsoleExpectMixin - so it's safe to update the signatures according to
the ConsoleExpectMixin.

For ConsoleProtocol.expect() I've used the type definition of the
underlying pexpect library.

I have not updated the return types, since it's not clear to me what the
ConsoleExpectMixin should return.

Signed-off-by: Chris Fiege <cfi@pengutronix.de>

Author: SmithChart

labgrid/protocol/consoleprotocol.py

@@ -1,11 +1,13 @@
 import abc
+from typing import Optional, Union
+from pexpect import EOF, TIMEOUT
 
 
 class ConsoleProtocol(abc.ABC):
     """Abstract class for the ConsoleProtocol"""
 
     @abc.abstractmethod
-    def read(self):
+    def read(self, size: int = 1, timeout: float = 0.0, max_size: Optional[int] = None):
         """
         Read data from underlying port
         """
@@ -24,7 +26,16 @@ def sendline(self, line: str):
     def sendcontrol(self, char: str):
         raise NotImplementedError
 
-    def expect(self, pattern: str):
+    def expect(
+            self,
+            pattern: Union[
+                str, bytes, type[EOF], type[TIMEOUT], list[
+                    Union[str, bytes, type[EOF], type[TIMEOUT]]
+                ]
+            ],
+
+            timeout: float = -1,
+    ):
         raise NotImplementedError
 
     class Client(abc.ABC):