Skip to content

Commit

Permalink
Merge pull request #787 from pyvisa/vicp-fix
Browse files Browse the repository at this point in the history
highlevel: allow missing board number which is the case for VICP
  • Loading branch information
MatthieuDartiailh committed Nov 22, 2023
2 parents 04102ee + 8694883 commit d1604e7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
PyVISA Changelog
================

1.14.1 (22-11-2023)
-------------------
- fix handling of missing board number for VICP resources PR #787

1.14.0 (13-11-2023)
-------------------
- fix ctypes truncated pointers on 64-bit for ViBusAddress, ViBusSize, ViAttrState PR #725
Expand Down
5 changes: 3 additions & 2 deletions pyvisa/highlevel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2053,8 +2053,9 @@ def parse_resource_extended(
else parsed.interface # type: ignore
)
# In some cases the board number may not be convertible to an int
# PyVISA-py serial resources on Linux for example
except ValueError:
# PyVISA-py serial resources on Linux for example. For VICP, there is
# no such attribute.
except (ValueError, AttributeError):
board_number = None

return (
Expand Down

0 comments on commit d1604e7

Please sign in to comment.