Skip to content

Commit

Permalink
gpib: do not import GpibError from Gpib since it lives in gpib module
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthieuDartiailh committed Aug 7, 2020
1 parent c8e3718 commit 24da55d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pyvisa_py/gpib.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
GPIB_CTYPES = False
try:
import gpib # typing: ignore
from Gpib import Gpib, GpibError # typing: ignore
from Gpib import Gpib # typing: ignore
except ImportError as e:
Session.register_unavailable(
constants.InterfaceType.gpib,
Expand Down Expand Up @@ -463,7 +463,7 @@ def gpib_control_ren(self, mode: constants.RENLineOperation) -> StatusCode:
ifc.listener(
self.parsed.primary_address, self.parsed.secondary_address
)
except GpibError as e:
except gpib.GpibError as e:
return convert_gpib_error(e, self.interface.ibsta(), "perform control REN")

return constants.StatusCode.success
Expand Down

0 comments on commit 24da55d

Please sign in to comment.