Skip to content

Python 3.9 compability fixes #1

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

Open
emiljaregran wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Python 3.9 compability fixes #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69663f8
Decode multimeter responses into unicode strings
emiljaregran Aug 14, 2021
f881971
Use regex search() instead of findall()
emiljaregran Aug 14, 2021
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
10 changes: 5 additions & 5 deletions DMM_34401a.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ def DMM_close(self):
def DMM_ID(self):
print("Arrived here")
self.write("*IDN?\n".encode())
print(self.readline().encode())
print(self.readline().decode())

"""
Check if the connected DMM is the 34401A
"""
def DMM_ID_CHECK(self):
self.write("*IDN?\n".encode())
s = self.readline()
if s.find("34401A") == 1:
s = self.readline().decode()
if "34401A" in s:
return 1
else:
return 0
Expand Down Expand Up @@ -79,9 +79,9 @@ def DMM_read_raw(self):
"""
def DMM_read_float(self):
self.write("READ?\n".encode())
result = self.readline()
result = self.readline().decode()
regex = re.compile('[+-][0-9][.][0-9]*[Ee][+-][0-9][0-9]')
if re.findall(regex, result) >= 1:
if re.search(regex, result):
return float(result)
else:
return False