@@ -18,17 +18,16 @@ def __init__(self, device_identifier, backend, timeout):
1818 try :
1919 _py_pyvisa_module = import_module ('pyvisa' )
2020 except ModuleNotFoundError as e :
21- raise ModuleNotFoundError ("pyvisa module not found, please install it" ) from e
22- else :
23- _pyvisa_resource_manager = _py_pyvisa_module .ResourceManager (backend )
24- if _pyvisa_resource_manager is None :
25- raise ValueError ("pyVISA backend not found" )
26- self ._pyvisa_device = _pyvisa_resource_manager .open_resource (device_identifier )
27- if 'SOCKET' in device_identifier :
28- self ._pyvisa_device .read_termination = '\n '
29- self ._pyvisa_device .write_termination = '\n '
30- if self ._pyvisa_device is None :
31- raise ValueError ("pyVISA device not found" )
21+ if not importlib .util .find_spec ("pyvisa" ):
22+ raise ModuleNotFoundError ("pyvisa module not found, please install it" )
23+
24+ _py_pyvisa_module = import_module ('pyvisa' )
25+ _pyvisa_resource_manager = _py_pyvisa_module .ResourceManager (backend )
26+ if _pyvisa_resource_manager is None :
27+ raise ValueError ("pyVISA backend not found" )
28+ self ._pyvisa_device = _pyvisa_resource_manager .open_resource (device_identifier )
29+ if self ._pyvisa_device is None :
30+ raise ValueError ("pyVISA device not found
3231 try :
3332 self ._pyvisa_device .clear ()
3433 except _py_pyvisa_module .errors .VisaIOError as e :
0 commit comments