Run isort and black for consistent style

David Miguel Susano Pinto · David Miguel Susano Pinto · commit 53f18561da5a · 2024-06-11T14:49:50.000+01:00
diff --git a/microscope/_wrappers/BMC.py b/microscope/_wrappers/BMC.py
@@ -26,7 +26,6 @@
 
 import microscope._utils
 
-
 if os.name == "nt":  # is windows
     # Not actually tested yet
     SDK = microscope._utils.library_loader("BMC2", ctypes.WinDLL)
diff --git a/microscope/_wrappers/asdk.py b/microscope/_wrappers/asdk.py
@@ -26,7 +26,6 @@
 
 import microscope._utils
 
-
 if os.name == "nt":  # is windows
     _libname = "ASDK"
 else:
diff --git a/microscope/_wrappers/dcamapi4.py b/microscope/_wrappers/dcamapi4.py
@@ -36,7 +36,6 @@
 
 import microscope._utils
 
-
 if os.name == "nt":
     _LIB = microscope._utils.library_loader("dcamapi", ctypes.WinDLL)
 else:
diff --git a/microscope/_wrappers/mirao52e.py b/microscope/_wrappers/mirao52e.py
@@ -24,7 +24,6 @@
 
 import microscope._utils
 
-
 # Vendor only supports Windows
 SDK = microscope._utils.library_loader("mirao52e", ctypes.WinDLL)
 
diff --git a/microscope/cameras/_SDK3.py b/microscope/cameras/_SDK3.py
@@ -25,7 +25,6 @@
 
 import microscope._utils
 
-
 #### typedefs
 AT_H = ctypes.c_int
 AT_BOOL = ctypes.c_int
diff --git a/microscope/cameras/andorsdk3.py b/microscope/cameras/andorsdk3.py
@@ -42,7 +42,6 @@
     ATString,
 )
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/cameras/atmcd.py b/microscope/cameras/atmcd.py
@@ -67,7 +67,6 @@
 import microscope._utils
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/cameras/hamamatsu.py b/microscope/cameras/hamamatsu.py
@@ -52,7 +52,6 @@
 import microscope
 import microscope.abc
 
-
 try:
     import microscope._wrappers.dcamapi4 as dcam
 except Exception as e:
diff --git a/microscope/cameras/picamera.py b/microscope/cameras/picamera.py
@@ -33,7 +33,6 @@
 from microscope import ROI, Binning, TriggerMode, TriggerType
 from microscope.abc import keep_acquiring
 
-
 GPIO_Trigger = 21
 GPIO_CAMLED = 5
 
diff --git a/microscope/cameras/pvcam.py b/microscope/cameras/pvcam.py
@@ -147,7 +147,6 @@
 import microscope._utils
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/cameras/ximea.py b/microscope/cameras/ximea.py
@@ -67,7 +67,6 @@
 import microscope
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/clients.py b/microscope/clients.py
@@ -28,7 +28,6 @@
 
 import Pyro4
 
-
 # Pyro configuration. Use pickle because it can serialize numpy ndarrays.
 Pyro4.config.SERIALIZERS_ACCEPTED.add("pickle")
 Pyro4.config.SERIALIZER = "pickle"
diff --git a/microscope/controllers/coolled.py b/microscope/controllers/coolled.py
@@ -29,7 +29,6 @@
 import microscope._utils
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/controllers/ludl.py b/microscope/controllers/ludl.py
@@ -31,7 +31,6 @@
 
 import microscope.abc
 
-
 # so far very basic support for stages
 # no support for filter, shutters, or slide loader as I dont have hardware
 
diff --git a/microscope/controllers/toptica.py b/microscope/controllers/toptica.py
@@ -26,7 +26,6 @@
 import microscope._utils
 import microscope.abc
 
-
 _LOGGER = logging.getLogger(__name__)
 
 _QUOTATION_CODE = ord(b'"')
diff --git a/microscope/controllers/zaber.py b/microscope/controllers/zaber.py
@@ -51,7 +51,6 @@
 import microscope._utils
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 _AT_CODE = ord(b"@")
diff --git a/microscope/device_server.py b/microscope/device_server.py
@@ -55,7 +55,6 @@
 import microscope.abc
 from microscope.abc import FloatingDeviceMixin
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/devices.py b/microscope/devices.py
@@ -21,19 +21,15 @@
 """
 
 from microscope import ROI, AxisLimits, Binning, TriggerMode, TriggerType
-from microscope.abc import (
-    Camera as CameraDevice,
-    Controller as ControllerDevice,
-    DataDevice,
-    DeformableMirror,
-    Device,
-    FilterWheel as FilterWheelBase,
-    FloatingDeviceMixin,
-    LightSource as LaserDevice,
-    SerialDeviceMixin as SerialDeviceMixIn,
-    Stage as StageDevice,
-    StageAxis,
-    TriggerTargetMixin as TriggerTargetMixIn,
-    keep_acquiring,
-)
+from microscope.abc import Camera as CameraDevice
+from microscope.abc import Controller as ControllerDevice
+from microscope.abc import DataDevice, DeformableMirror, Device
+from microscope.abc import FilterWheel as FilterWheelBase
+from microscope.abc import FloatingDeviceMixin
+from microscope.abc import LightSource as LaserDevice
+from microscope.abc import SerialDeviceMixin as SerialDeviceMixIn
+from microscope.abc import Stage as StageDevice
+from microscope.abc import StageAxis
+from microscope.abc import TriggerTargetMixin as TriggerTargetMixIn
+from microscope.abc import keep_acquiring
 from microscope.device_server import device
diff --git a/microscope/filterwheels/aurox.py b/microscope/filterwheels/aurox.py
@@ -29,7 +29,6 @@
 import microscope
 import microscope.devices
 
-
 # Clarity constants. These may differ across products, so mangle names.
 # USB IDs
 _Clarity__VENDORID = 0x1F0A
diff --git a/microscope/gui.py b/microscope/gui.py
@@ -43,7 +43,6 @@
 
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/lights/cobolt.py b/microscope/lights/cobolt.py
@@ -25,7 +25,6 @@
 import microscope._utils
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/lights/deepstar.py b/microscope/lights/deepstar.py
@@ -25,7 +25,6 @@
 import microscope
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/lights/obis.py b/microscope/lights/obis.py
@@ -26,7 +26,6 @@
 import microscope
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/lights/sapphire.py b/microscope/lights/sapphire.py
@@ -27,7 +27,6 @@
 import microscope._utils
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/lights/toptica.py b/microscope/lights/toptica.py
@@ -27,7 +27,6 @@
 import microscope._utils
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/mirror/alpao.py b/microscope/mirror/alpao.py
@@ -25,7 +25,6 @@
 import microscope
 import microscope.abc
 
-
 try:
     import microscope._wrappers.asdk as asdk
 except Exception as e:
diff --git a/microscope/mirror/bmc.py b/microscope/mirror/bmc.py
@@ -30,7 +30,6 @@
 import microscope._utils
 import microscope.abc
 
-
 try:
     import microscope._wrappers.BMC as BMC
 except Exception as e:
diff --git a/microscope/mirror/mirao52e.py b/microscope/mirror/mirao52e.py
@@ -48,7 +48,6 @@
 import microscope._utils
 import microscope.abc
 
-
 try:
     import microscope._wrappers.mirao52e as mro
 except Exception as e:
diff --git a/microscope/simulators/__init__.py b/microscope/simulators/__init__.py
@@ -39,7 +39,6 @@
 import microscope._utils
 import microscope.abc
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/simulators/stage_aware_camera.py b/microscope/simulators/stage_aware_camera.py
@@ -37,7 +37,6 @@
     SimulatedStage,
 )
 
-
 _logger = logging.getLogger(__name__)
 
 
diff --git a/microscope/stages/linkam.py b/microscope/stages/linkam.py
@@ -51,7 +51,6 @@
 import microscope._utils
 import microscope.abc
 
-
 _max_version_length = 20
 
 # Typedefs from C headers
diff --git a/microscope/testsuite/devices.py b/microscope/testsuite/devices.py
@@ -26,15 +26,14 @@
 
 # These classes were originally in testsuite but have been moved to
 # their own subpackage, these imports are for backwards compatibility.
+from microscope.simulators import SimulatedCamera
+from microscope.simulators import SimulatedController as TestController
 from microscope.simulators import (
-    SimulatedCamera,
-    SimulatedController as TestController,
     SimulatedDeformableMirror as TestDeformableMirror,
-    SimulatedFilterWheel as TestFilterWheel,
-    SimulatedLightSource,
-    SimulatedStage as TestStage,
 )
-
+from microscope.simulators import SimulatedFilterWheel as TestFilterWheel
+from microscope.simulators import SimulatedLightSource
+from microscope.simulators import SimulatedStage as TestStage
 
 _logger = logging.getLogger(__name__)
 
diff --git a/microscope/win32.py b/microscope/win32.py
@@ -38,7 +38,6 @@
 
 import servicemanager
 
-
 # These win32* modules both import win32api which is a pyd file.
 # Importing win32api can be problematic because of Windows things
 # specially when running as a Windows.  So if it fails, add the

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@`
`42`	`42`	`ATString,`
`43`	`43`	`)`
`44`	`44`
`45`		`-`
`46`	`45`	`_logger = logging.getLogger(__name__)`
`47`	`46`
`48`	`47`