Fix "pyvisa_timeout_context" from pyvisa transition

mabuchilab · Dec 31, 2024 · 5b5dbd8 · 5b5dbd8
1 parent a02cab5
commit 5b5dbd8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/instrumental/drivers/lasers/femto_ferb.py b/src/instrumental/drivers/lasers/femto_ferb.py
@@ -7,8 +7,8 @@
 other things make the usb connection appear as a serial port, must be
 installed (available from http://www.toptica.com/products/ultrafast_fiber_lasers/femtofiber_smart/femtosecond_erbium_fiber_laser_1560_nm_femtoferb)
 """
+from ..util import visa_timeout_context
 from . import Laser
-from ..util import pyvisa_timeout_context
 
 _INST_PRIORITY = 6
 _INST_PARAMS = ['visa_address']

diff --git a/src/instrumental/drivers/powermeters/newport.py b/src/instrumental/drivers/powermeters/newport.py
@@ -18,10 +18,10 @@
 """
 import time
 
-from . import PowerMeter
-from .. import Facet, MessageFacet, VisaMixin, deprecated
-from ..util import pyvisa_timeout_context
 from ... import Q_, u
+from .. import Facet, MessageFacet, VisaMixin, deprecated
+from ..util import visa_timeout_context
+from . import PowerMeter
 
 
 def _check_visa_support(visa_inst):

diff --git a/src/instrumental/drivers/wavemeters/burleigh.py b/src/instrumental/drivers/wavemeters/burleigh.py
@@ -5,12 +5,12 @@
 
 * WA-1000/1500
 """
-import warnings
 import time
+import warnings
 
-from . import Wavemeter
-from ..util import pyvisa_timeout_context
 from ... import Q_
+from ..util import visa_timeout_context
+from . import Wavemeter
 
 # Constants; See Appendix A of WA-1000/1500 manual for details
 # 'Hard' command codes