Remove *args from all devices __init__ (issue #84)

Take only **kwargs when constructing a device instance.  This makes it
clear which of the classes will process a given argument.  Should
enable us to make better use of multiple hierarchy.  All cameras and
the ThorlabsFilterWheel already discarded `*args` and the deviceserver
already only works with `**kwargs` anyway.

Author: carandraug

microscope/cameras/andorsdk3.py

@@ -101,7 +101,7 @@ def wrapper(self, *args, **kwargs):
 class AndorSDK3(devices.FloatingDeviceMixin,
                 devices.CameraDevice):
     SDK_INITIALIZED = False
-    def __init__(self, index=0, *args, **kwargs):
+    def __init__(self, index=0, **kwargs):
         super(AndorSDK3, self).__init__(index=index, **kwargs)
         if not AndorSDK3.SDK_INITIALIZED:
             SDK3.InitialiseLibrary()

microscope/cameras/atmcd.py

@@ -1139,7 +1139,7 @@ def __str__(self):
 class AndorAtmcd(devices.FloatingDeviceMixin,
                  devices.CameraDevice):
     """ Implements CameraDevice interface for Andor ATMCD library."""
-    def __init__(self, index=0, *args, **kwargs):
+    def __init__(self, index=0, **kwargs):
         super().__init__(index=index, **kwargs)
         # Recursion depth for context manager behaviour.
         self._rdepth = 0

microscope/cameras/pvcam.py

@@ -1185,7 +1185,7 @@ class PVCamera(devices.FloatingDeviceMixin, devices.CameraDevice):
     open_cameras = []
 
 
-    def __init__(self, index=0, *args, **kwargs):
+    def __init__(self, index=0, **kwargs):
         super(PVCamera, self).__init__(index=index, **kwargs)
         # Camera name in DLL.
         self._pv_name = None

microscope/devices.py

@@ -641,7 +641,7 @@ class CameraDevice(DataDevice):
     """
     ALLOWED_TRANSFORMS = [p for p in itertools.product(*3 * [[False, True]])]
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         super(CameraDevice, self).__init__(**kwargs)
         # A list of readout mode descriptions.
         self._readout_modes = ['default']
@@ -880,8 +880,8 @@ class SerialDeviceMixIn(object):
     """
     __metaclass__ = abc.ABCMeta
 
-    def __init__(self, *args, **kwargs):
-        super(SerialDeviceMixIn, self).__init__(*args, **kwargs)
+    def __init__(self, **kwargs):
+        super(SerialDeviceMixIn, self).__init__(**kwargs)
         ## TODO: We should probably construct the connection here but
         ##       the Serial constructor takes a lot of arguments, and
         ##       it becomes tricky to separate those from arguments to
@@ -948,7 +948,7 @@ class DeformableMirror(Device):
     __metaclass__ = abc.ABCMeta
 
     @abc.abstractmethod
-    def __init__(self, *args, **kwargs):
+    def __init__(self, **kwargs):
         """Constructor.
 
         Subclasses must define the following properties during
@@ -960,7 +960,7 @@ def __init__(self, *args, **kwargs):
         `_pattern_idx` are initialized to None to support the queueing
         of patterns and software triggering.
         """
-        super(DeformableMirror, self).__init__(*args, **kwargs)
+        super(DeformableMirror, self).__init__(**kwargs)
 
         self._patterns = None
         self._patterns_idx = None
@@ -1030,8 +1030,8 @@ class LaserDevice(Device):
     __metaclass__ = abc.ABCMeta
 
     @abc.abstractmethod
-    def __init__(self, *args, **kwargs):
-        super(LaserDevice, self).__init__(*args, **kwargs)
+    def __init__(self, **kwargs):
+        super(LaserDevice, self).__init__(**kwargs)
         self._set_point = None
 
     @abc.abstractmethod
@@ -1090,8 +1090,8 @@ def set_power_mw(self, mw):
 class FilterWheelBase(Device):
     __metaclass__ = abc.ABCMeta
 
-    def __init__(self, *args, filters=[], positions=0, **kwargs):
-        super(FilterWheelBase, self).__init__(*args, **kwargs)
+    def __init__(self, filters=[], positions=0, **kwargs):
+        super(FilterWheelBase, self).__init__(**kwargs)
         if isinstance(filters, dict):
             self._filters = filters
         else:

microscope/filterwheels/aurox.py

@@ -86,8 +86,8 @@ class Clarity(microscope.devices.FilterWheelBase):
                   __GETSERIAL: 4,
                   __FULLSTAT: 10}
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
         from threading import Lock
         self._lock = Lock()
         self._hid = None

microscope/lasers/cobolt.py

@@ -24,8 +24,8 @@
 
 
 class CoboltLaser(devices.SerialDeviceMixIn, devices.LaserDevice):
-    def __init__(self, com=None, baud=115200, timeout=0.01, *args, **kwargs):
-        super(CoboltLaser, self).__init__(*args, **kwargs)
+    def __init__(self, com=None, baud=115200, timeout=0.01, **kwargs):
+        super(CoboltLaser, self).__init__(**kwargs)
         self.connection = serial.Serial(port = com,
             baudrate = baud, timeout = timeout,
             stopbits = serial.STOPBITS_ONE,

microscope/lasers/deepstar.py

@@ -24,8 +24,8 @@
 from microscope import devices
 
 class DeepstarLaser(devices.SerialDeviceMixIn, devices.LaserDevice):
-    def __init__(self, com, baud=9600, timeout=2.0, *args, **kwargs):
-        super(DeepstarLaser, self).__init__(*args, **kwargs)
+    def __init__(self, com, baud=9600, timeout=2.0, **kwargs):
+        super(DeepstarLaser, self).__init__(**kwargs)
         self.connection = serial.Serial(port = com,
             baudrate = baud, timeout = timeout,
             stopbits = serial.STOPBITS_ONE,

microscope/lasers/sapphire.py

@@ -35,11 +35,11 @@ class SapphireLaser(devices.SerialDeviceMixIn, devices.LaserDevice):
         b'6': 'Error',
     }
 
-    def __init__(self, com=None, baud=19200, timeout=0.5, *args, **kwargs):
+    def __init__(self, com=None, baud=19200, timeout=0.5, **kwargs):
         # laser controller must run at 19200 baud, 8+1 bits,
         # no parity or flow control
         # timeout is recomended to be over 0.5
-        super(SapphireLaser, self).__init__(*args, **kwargs)
+        super(SapphireLaser, self).__init__(**kwargs)
         self.connection = serial.Serial(port = com,
             baudrate = baud, timeout = timeout,
             stopbits = serial.STOPBITS_ONE,

microscope/mirror/alpao.py

@@ -95,14 +95,14 @@ def _raise_if_error(self, status, exception_cls=Exception):
                 raise exception_cls(msg)
 
 
-    def __init__(self, serial_number, *args, **kwargs):
+    def __init__(self, serial_number, **kwargs):
         """
         Parameters
         ----------
         serial_number: string
         The serial number of the deformable mirror, something like "BIL103".
         """
-        super(AlpaoDeformableMirror, self).__init__(*args, **kwargs)
+        super(AlpaoDeformableMirror, self).__init__(**kwargs)
 
         ## We need to constantly check for errors and need a buffer to
         ## have the message written to.  To avoid creating a new buffer

microscope/mirror/bmc.py

@@ -31,8 +31,8 @@
 
 
 class BMCDeformableMirror(DeformableMirror):
-    def __init__(self, serial_number, *args, **kwargs):
-        super(BMCDeformableMirror, self).__init__(*args, **kwargs)
+    def __init__(self, serial_number, **kwargs):
+        super(BMCDeformableMirror, self).__init__(**kwargs)
         self._dm = BMC.DM()
 
         if __debug__: