Skip to content

Commit bb268ad

Browse files
committed
Fix bug in list_instruments when module arg is absent
1 parent 647e6ae commit bb268ad

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

instrumental/drivers/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,12 +739,15 @@ def list_instruments(server=None, module=None, blacklist=None):
739739
try:
740740
import visa
741741
try:
742-
inst_list = [p for p in list_visa_instruments() if module in p['module']]
742+
inst_list = list_visa_instruments()
743743
except visa.VisaIOError:
744744
inst_list = [] # Hide visa errors
745745
except (ImportError, ConfigError):
746746
inst_list = [] # Ignore if PyVISA not installed or configured
747747

748+
if module:
749+
inst_list = [p for p in list_visa_instruments() if module in p['module']]
750+
748751
for mod_name in driver_info:
749752
if module and module not in mod_name:
750753
continue

0 commit comments

Comments
 (0)