Merge pull request #237 from sandialabs/patch_import_errors

bug(drivers): Fixed driver import exceptions to actually load driver

Author: mplilly4395

pyscan/drivers/attocube/__init__.py

@@ -1,8 +1,8 @@
 import sys
 
 name = 'pylablib'
-
-if name in sys.modules:
+try:
+    import pylablib
     from .attocubeANC350 import AttocubeANC350
-else:
+except ModuleNotFoundError:
     from .attocube_exceptions import PylabLibMissingException as AttocubeANC350

pyscan/drivers/heliotis/__init__.py

@@ -2,7 +2,8 @@
 
 name = 'libHeLIC'
 
-if name in sys.modules:
+try:
+    import libHeLIC
     from .helioscamera import HeliosCamera
-else:
+except ModuleNotFoundError:
     from .helios_exceptions import HeliosImportException as HeliosCamera

pyscan/drivers/oceanoptics/__init__.py

@@ -3,7 +3,8 @@
 # For illustrative purposes.
 name = 'seabreeze'
 
-if name in sys.modules:
+try:
+    import seabreeze
     from .oceanopticsqepro import OceanOpticsQEPro
-else:
+except ModuleNotFoundError:
     from .oceanoptics_exceptions import SeabreezeMissingException as OceanOpticsQEPro

pyscan/drivers/thorlabs/__init__.py

@@ -2,14 +2,12 @@
 import importlib.util
 import sys
 
-name = 'thorlabs_kinesis'
-
-
-if name in sys.modules:
+try:
+    import pyscan_tlk
     from .thorlabsbpc303 import ThorlabsBPC303
     from .thorlabsbsc203 import ThorlabsBSC203
     from .thorlabsmff101 import ThorlabsMFF101
-else:
+except ModuleNotFoundError:
     from .thorlabs_exceptions import ThorlabsKinesisImportException as ThorlabsBPC303
     from .thorlabs_exceptions import ThorlabsKinesisImportException as ThorlabsBSC203
     from .thorlabs_exceptions import ThorlabsKinesisImportException as ThorlabsMFF101