Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Handle null term char #394

Merged
merged 3 commits into from
Oct 9, 2023
Merged

fix: Handle null term char #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b673307
fix: Handle null term char
jonyscathe Sep 24, 2023
de149aa
Add to changelog
jonyscathe Sep 25, 2023
51b43e3
Merge branch 'main' into null-terminator-fix
MatthieuDartiailh Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ PyVISA-py Changelog
- addd URL-support to ASLR devices PR #386
- add support for GPIB secondary addresses
- fix missing sock.close() in rpc _connect()
- fix HiSLIP message tracking after read timeout #376
- fix HiSLIP message tracking after read timeout PR #376
- handle read_termination of null in tcipip PR #394

0.7.0 (05/05/2023)
------------------
Expand Down
2 changes: 1 addition & 1 deletion pyvisa_py/tcpip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,7 @@ def read(self, count: int) -> Tuple[bytes, StatusCode]:
chunk_length = self.max_recv_size

term_char, _ = self.get_attribute(ResourceAttribute.termchar)
term_byte = common.int_to_byte(term_char) if term_char else b""
term_byte = common.int_to_byte(term_char) if term_char is not None else b""
term_char_en, _ = self.get_attribute(ResourceAttribute.termchar_enabled)
suppress_end_en, _ = self.get_attribute(ResourceAttribute.suppress_end_enabled)

Expand Down
Loading