Remove inheritance from object needed for Python 2 support.

To support Python 2, inheriting from object was required.  However, we
now only work in Python 3 so this is no longer needed and is raising
issues during the build of the API documentation.

Author: carandraug

microscope/cameras/SDK3.py

@@ -120,7 +120,7 @@ class TimeoutError(CameraError):
 STRING = POINTER(AT_WC)
 
 #classes so that we do some magic and automatically add byrefs etc ... can classify outputs
-class _meta(object):
+class _meta:
     pass
 
 class OUTPUT(_meta):
@@ -155,7 +155,7 @@ def stripMeta(val):
     else:
         return val
 
-class dllFunction(object):
+class dllFunction:
     def __init__(self, name, args = [], argnames = [], lib='ATCORE'):
         self.f = getattr(_stdcall_libraries[lib], name)
         self.f.restype = c_int

microscope/cameras/SDK3Cam.py

@@ -24,7 +24,7 @@
 
 from .import SDK3
 
-class ATProperty(object):
+class ATProperty:
     def connect(self, handle, propertyName):
         self.handle = handle
         self.propertyName = propertyName
@@ -112,7 +112,7 @@ class ATCommand(ATProperty):
     def __call__(self):
         return SDK3.Command(self.handle, self.propertyName)
 
-class camReg(object):
+class camReg:
     #keep track of the number of cameras initialised so we can initialise and finalise the library
     numCameras = 0
 
@@ -139,7 +139,7 @@ def GetSoftwareVersion():
     return SDK3.GetString(SDK3.AT_HANDLE_SYSTEM, 'SoftwareVersion', 255)
 
 
-class SDK3Camera(object):         
+class SDK3Camera:         
     def __init__(self, camNum):
         """camera initialisation - note that this should be called  from derived classes
         *AFTER* the properties have been defined"""

microscope/cameras/atmcd.py

@@ -471,7 +471,7 @@ def lookup_status(code):
 # SDK3 wrapper, with some modifications and additions.
 
 # Classes used to handle outputs and parameters that need buffers.
-class _meta(object):
+class _meta:
     pass
 
 STRING = c_char_p
@@ -555,7 +555,7 @@ def __init__(self, status):
         self.status = status
 
 
-class dllFunction(object):
+class dllFunction:
     """A wrapper class for DLL functions to make them available in python."""
     def __init__(self, name, args=[], argnames=[], rstatus=False, lib=_dll):
         # the library function

microscope/cameras/pvcam.py

@@ -661,7 +661,7 @@ class md_frame(ctypes.Structure):
 
 # classes so that we do some magic and automatically add byrefs etc ... can classify outputs
 # (Nicked from PYME's Ixon wrapper.)
-class _meta(object):
+class _meta:
     pass
 
 
@@ -703,7 +703,7 @@ def stripMeta(val):
 CALLBACK = ctypes.CFUNCTYPE(ctypes.c_void_p)
 
 
-class dllFunction(object):
+class dllFunction:
     """Expose a DLL function to python.
 
     (Again, largely nicked from PYME.)"""
@@ -977,7 +977,7 @@ def get_param_dtype(param_id):
 
 # === Python classes ===
 # Trigger modes.
-class TriggerMode(object):
+class TriggerMode:
     """A microscope trigger mode using PVCAM PMODES."""
     def __init__(self, id, label, pv_mode, microscope_mode):
         self.id = id

microscope/clients.py

@@ -33,7 +33,7 @@
 LISTENERS = {}
 
 
-class Client(object):
+class Client:
     """Base Client object that makes methods on proxy available locally."""
     def __init__(self, url):
         self._url = url

microscope/devices.py

@@ -173,7 +173,7 @@ def device(cls, host, port, conf={}, uid=None):
     return dict(cls=cls, host=host, port=int(port), uid=uid, conf=conf)
 
 
-class FloatingDeviceMixin(object):
+class FloatingDeviceMixin:
     """A mixin for devices that 'float'.
 
     Some SDKs handling multiple devices do not allow for explicit
@@ -190,7 +190,7 @@ def get_id(self):
         pass
 
 
-class Device(object):
+class Device:
     """A base device class. All devices should subclass this class.
 
     Args:
@@ -839,7 +839,7 @@ class TriggerMode(Enum):
     START = 4
 
 
-class TriggerTargetMixIn(object):
+class TriggerTargetMixIn:
     """MixIn for Device that may be the target of a hardware trigger.
 
     Subclasses must set a `_trigger_type` and `_trigger_mode` property
@@ -868,7 +868,7 @@ def set_trigger(self, ttype, tmode):
         pass
 
 
-class SerialDeviceMixIn(object):
+class SerialDeviceMixIn:
     """MixIn for devices that are controlled via serial.
 
     Currently handles the flushing and locking of the comms channel