Skip to content

fixed import error and print statement python 3 compatibility #3

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
CatherineH wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed import error and print statement python 3 compatibility #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ Vagrantfile
my_references/
playbook.yml
upgrade_venv_packages.sh
# pycharm generated
.idea
31 changes: 16 additions & 15 deletions ivi/tektronix/tektronixDPO5000.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
THE SOFTWARE.

"""
from ivi import UnexpectedResponseException

from .tektronixBaseScope import *

Expand Down Expand Up @@ -164,21 +165,21 @@ def _measurement_fetch_waveform(self, index):

# Read preamble
pre = self._ask(":wfmoutpre?").split(';')
print "pre = ",self._ask("WFMOutpre?")
print "byt_nr", self._ask("WFMOUTpre:BYT_NR?")
print "bit_nr", self._ask("WFMOUTpre:BIT_NR?")
print "ENCDG", self._ask("WFMOUTpre:ENCDG?")
print "BNFMT", self._ask("WFMOUTpre:BN_FMT?")
print "BYTOR", self._ask("WFMOUTpre:BYT_OR?")
print "NRFMT", self._ask("WFMOUTpre:NR_PT?")
print "PTFMT", self._ask("WFMOUTpre:PT_FMT?")
print "XINC", self._ask("WFMOUTpre:XINCR?")
print "XZERO", self._ask("WFMOUTpre:XZERO?")
print "PTOFF", self._ask("WFMOUTpre:PT_OFF?")
print "YMULT", self._ask("WFMOUTpre:YMULT?")
print "YOFOF", self._ask("WFMOUTpre:YOFF?")
print "YZERO", self._ask("WFMOUTpre:YZERO?")
print "NR_nr", self._ask("WFMOUTpre:NR_FR?")
print("pre = ", self._ask("WFMOutpre?"))
print("byt_nr", self._ask("WFMOUTpre:BYT_NR?"))
print("bit_nr", self._ask("WFMOUTpre:BIT_NR?"))
print("ENCDG", self._ask("WFMOUTpre:ENCDG?"))
print("BNFMT", self._ask("WFMOUTpre:BN_FMT?"))
print("BYTOR", self._ask("WFMOUTpre:BYT_OR?"))
print("NRFMT", self._ask("WFMOUTpre:NR_PT?"))
print("PTFMT", self._ask("WFMOUTpre:PT_FMT?"))
print("XINC", self._ask("WFMOUTpre:XINCR?"))
print("XZERO", self._ask("WFMOUTpre:XZERO?"))
print("PTOFF", self._ask("WFMOUTpre:PT_OFF?"))
print("YMULT", self._ask("WFMOUTpre:YMULT?"))
print("YOFOF", self._ask("WFMOUTpre:YOFF?"))
print("YZERO", self._ask("WFMOUTpre:YZERO?"))
print("NR_nr", self._ask("WFMOUTpre:NR_FR?"))
acq_format = pre[7].strip().upper()
points = int(pre[6])
point_size = int(pre[0])
Expand Down
31 changes: 16 additions & 15 deletions ivi/tektronix/tektronixDPO7000.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
THE SOFTWARE.

"""
from ivi import UnexpectedResponseException

from .tektronixBaseScope import *

Expand Down Expand Up @@ -163,21 +164,21 @@ def _measurement_fetch_waveform(self, index):

# Read preamble
pre = self._ask(":wfmoutpre?").split(';')
print "pre = ",self._ask("WFMOutpre?")
print "byt_nr", self._ask("WFMOUTpre:BYT_NR?")
print "bit_nr", self._ask("WFMOUTpre:BIT_NR?")
print "ENCDG", self._ask("WFMOUTpre:ENCDG?")
print "BNFMT", self._ask("WFMOUTpre:BN_FMT?")
print "BYTOR", self._ask("WFMOUTpre:BYT_OR?")
print "NRFMT", self._ask("WFMOUTpre:NR_PT?")
print "PTFMT", self._ask("WFMOUTpre:PT_FMT?")
print "XINC", self._ask("WFMOUTpre:XINCR?")
print "XZERO", self._ask("WFMOUTpre:XZERO?")
print "PTOFF", self._ask("WFMOUTpre:PT_OFF?")
print "YMULT", self._ask("WFMOUTpre:YMULT?")
print "YOFOF", self._ask("WFMOUTpre:YOFF?")
print "YZERO", self._ask("WFMOUTpre:YZERO?")
print "NR_nr", self._ask("WFMOUTpre:NR_FR?")
print("pre = ", self._ask("WFMOutpre?"))
print("byt_nr", self._ask("WFMOUTpre:BYT_NR?"))
print("bit_nr", self._ask("WFMOUTpre:BIT_NR?"))
print("ENCDG", self._ask("WFMOUTpre:ENCDG?"))
print("BNFMT", self._ask("WFMOUTpre:BN_FMT?"))
print("BYTOR", self._ask("WFMOUTpre:BYT_OR?"))
print("NRFMT", self._ask("WFMOUTpre:NR_PT?"))
print("PTFMT", self._ask("WFMOUTpre:PT_FMT?"))
print("XINC", self._ask("WFMOUTpre:XINCR?"))
print("XZERO", self._ask("WFMOUTpre:XZERO?"))
print("PTOFF", self._ask("WFMOUTpre:PT_OFF?"))
print("YMULT", self._ask("WFMOUTpre:YMULT?"))
print("YOFOF", self._ask("WFMOUTpre:YOFF?"))
print("YZERO", self._ask("WFMOUTpre:YZERO?"))
print("NR_nr", self._ask("WFMOUTpre:NR_FR?"))
acq_format = pre[7].strip().upper()
points = int(pre[6])
point_size = int(pre[0])
Expand Down