more cleanup

pyavcontrol/client/async_client.py

@@ -17,16 +17,10 @@ class DeviceClientAsync(DeviceClient):
     """Asynchronous client for communicating with devices via the provided connection"""
 
     def __init__(self, model: DeviceModel, connection: DeviceConnection, loop):
-        DeviceClient.__init__(self, model, connection)
-        self._connection = connection
+        super().__init__(model, connection)
         self._loop = loop
         self._callback = None
 
-        # FIXME: encoding should come from model
-        self._encoding = (
-            model.encoding
-        )  # serial_config.get(CONFIG.encoding, DEFAULT_ENCODING)
-
     @property
     def is_async(self):
         """

pyavcontrol/client/base.py

@@ -155,22 +155,19 @@ class DeviceClient(ABC):
     to control a device.
     """
 
-    def __new__(cls, *args, **kwargs):
-        return super().__new__(cls)
+    #def __new__(cls, *args, **kwargs):
+    #    return super().__new__(cls)
 
     def __init__(self, model: DeviceModel, connection: DeviceConnection):
         super().__init__()
         self._model = model
-        self._protocol_def = model.definition  # FIXME
         self._connection = connection
-        self._callback = None
-        self._encoding = DEFAULT_ENCODING
 
     def encoding(self) -> str:
         """
         :return: the bytes encoding format for requests/responses
         """
-        return self._encoding
+        return self._model.encoding
 
     @property
     def is_async(self):
@@ -200,7 +197,7 @@ def send_raw(self, data: bytes) -> None:
 
     # @abstractmethod
     def describe(self) -> dict:
-        return self._protocol_def
+        return self._model.definition
 
     # FIXME: should take:
     #   1. a model

pyavcontrol/client/sync_client.py

@@ -13,17 +13,8 @@ class DeviceClientSync(DeviceClient):
     """Synchronous client for communicating with devices via the provided connection"""
 
     def __init__(self, model: DeviceModel, connection: DeviceConnection):
-        DeviceClient.__init__(self, model, connection)
-        self._protocol_defs = None
-
-        # FIXME:
-        # self._connection = serial.serial_for_url(url, **serial_config)
-        self._connection = connection
-
+        super().__init__(model, connection)
         self._callback = None
-        self._encoding = (
-            model.encoding
-        )  # serial_config.get('encoding', DEFAULT_ENCODING)
 
     @synchronized
     def send_raw(self, data: bytes) -> None: