Use super() to call parent class method.

We are now dependent on Python 3.5 so we can rely on super() without
having to specify self's own type which lends to subtle bugs in case
of typos.  Also, use super() instead of ParentClass.method() as was
the case of DummyDSP and DummySLM.

Author: carandraug

microscope/cameras/andorsdk3.py

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

microscope/cameras/pvcam.py

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

microscope/cameras/ximea.py

@@ -53,7 +53,7 @@
 @Pyro4.behavior('single')
 class XimeaCamera(devices.CameraDevice):
     def __init__(self, **kwargs):
-        super(XimeaCamera, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self._acquiring = False
         self._exposure_time = 0.1
         self._triggered = False

microscope/clients.py

@@ -59,7 +59,7 @@ def _connect(self):
 class DataClient(Client):
     """A client that can receive and buffer data."""
     def __init__(self, url):
-        super(DataClient, self).__init__(url)
+        super().__init__(url)
         self._buffer = queue.Queue()
         # Register self with a listener.
         if self._url.split('@')[1].split(':')[0] in ['127.0.0.1', 'localhost']:

microscope/devices.py

@@ -394,7 +394,7 @@ class DataDevice(Device):
 
     def __init__(self, buffer_length=0, **kwargs):
         """Derived.__init__ must call this at some point."""
-        super(DataDevice, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         # A thread to fetch and dispatch data.
         self._fetch_thread = None
         # A flag to control the _fetch_thread.
@@ -469,7 +469,7 @@ def disable(self):
             if self._fetch_thread.is_alive():
                 self._fetch_thread_run = False
                 self._fetch_thread.join()
-        super(DataDevice, self).disable()
+        super().disable()
 
     @abc.abstractmethod
     def _fetch_data(self):
@@ -599,7 +599,7 @@ def set_client(self, new_client):
     @keep_acquiring
     def update_settings(self, settings, init=False):
         """Update settings, toggling acquisition if necessary."""
-        super(DataDevice, self).update_settings(settings, init)
+        super().update_settings(settings, init)
 
     # noinspection PyPep8Naming
     def receiveClient(self, client_uri):
@@ -641,7 +641,7 @@ class CameraDevice(DataDevice):
     ALLOWED_TRANSFORMS = [p for p in itertools.product(*3 * [[False, True]])]
 
     def __init__(self, **kwargs):
-        super(CameraDevice, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         # A list of readout mode descriptions.
         self._readout_modes = ['default']
         # The index of the current readout mode.
@@ -880,7 +880,7 @@ class SerialDeviceMixIn:
     __metaclass__ = abc.ABCMeta
 
     def __init__(self, **kwargs):
-        super(SerialDeviceMixIn, self).__init__(**kwargs)
+        super().__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
@@ -959,7 +959,7 @@ def __init__(self, **kwargs) -> None:
         `_pattern_idx` are initialized to None to support the queueing
         of patterns and software triggering.
         """
-        super(DeformableMirror, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         self._patterns = None  # type: typing.Optional[numpy.ndarray]
         self._pattern_idx = -1  # type: int
@@ -1030,7 +1030,7 @@ class LaserDevice(Device):
 
     @abc.abstractmethod
     def __init__(self, **kwargs):
-        super(LaserDevice, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self._set_point = None
 
     @abc.abstractmethod
@@ -1090,7 +1090,7 @@ class FilterWheelBase(Device):
     __metaclass__ = abc.ABCMeta
 
     def __init__(self, filters=[], positions=0, **kwargs):
-        super(FilterWheelBase, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         if isinstance(filters, dict):
             self._filters = filters
         else:

microscope/deviceserver.py

@@ -110,7 +110,7 @@ def __init__(self, device_def, id_to_host, id_to_port, exit_event=None):
         self._id_to_port = id_to_port
         # A shared event to allow clean shutdown.
         self.exit_event = exit_event
-        super(DeviceServer, self).__init__()
+        super().__init__()
         self.daemon = True
 
     def clone(self):

microscope/lasers/cobolt.py

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

microscope/lasers/deepstar.py

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

microscope/lasers/sapphire.py

@@ -39,7 +39,7 @@ 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__(**kwargs)
+        super().__init__(**kwargs)
         self.connection = serial.Serial(port = com,
             baudrate = baud, timeout = timeout,
             stopbits = serial.STOPBITS_ONE,
@@ -57,7 +57,7 @@ def __init__(self, com=None, baud=19200, timeout=0.5, **kwargs):
         self._logger.info("Sapphire laser serial number: [%s]" % headID)
 
     def _write(self, command):
-        count = super(SapphireLaser, self)._write(command)
+        count = super()._write(command)
         ## This device always writes backs something.  If echo is on,
         ## it's the whole command, otherwise just an empty line.  Read
         ## it and throw it away.

microscope/mirror/alpao.py

@@ -102,7 +102,7 @@ def __init__(self, serial_number, **kwargs):
         serial_number: string
         The serial number of the deformable mirror, something like "BIL103".
         """
-        super(AlpaoDeformableMirror, self).__init__(**kwargs)
+        super().__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
@@ -152,7 +152,7 @@ def set_trigger(self, ttype, tmode):
 
     def queue_patterns(self, patterns):
         if self._trigger_type == TriggerType.SOFTWARE:
-            super(AlpaoDeformableMirror, self).queue_patterns(patterns)
+            super().queue_patterns(patterns)
             return
 
         self._validate_patterns(patterns)
@@ -182,7 +182,7 @@ def queue_patterns(self, patterns):
 
     def next_pattern(self):
         if self.trigger_type == TriggerType.SOFTWARE:
-            super(AlpaoDeformableMirror, self).next_pattern()
+            super().next_pattern()
         else:
             raise Exception("software trigger received when set for"
                             " hardware trigger")
@@ -192,4 +192,4 @@ def __del__(self):
         if status != asdk.SUCCESS:
             msg = self._find_error_str()
             warnings.warn(msg)
-        super(AlpaoDeformableMirror, self).__del__()
+        super().__del__()