From 0d3593ebd826a1bcf5fc1be76cca2dac8283adc4 Mon Sep 17 00:00:00 2001 From: Catherine Holloway Date: Sun, 26 Feb 2017 11:42:46 -0500 Subject: [PATCH] fixed import error and print statement python 3 compatibility --- .gitignore | 2 ++ ivi/tektronix/tektronixDPO5000.py | 31 ++++++++++++++++--------------- ivi/tektronix/tektronixDPO7000.py | 31 ++++++++++++++++--------------- 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index c41e6d94..413094ae 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ Vagrantfile my_references/ playbook.yml upgrade_venv_packages.sh +# pycharm generated +.idea diff --git a/ivi/tektronix/tektronixDPO5000.py b/ivi/tektronix/tektronixDPO5000.py index 40ae1dc2..f9186b9b 100644 --- a/ivi/tektronix/tektronixDPO5000.py +++ b/ivi/tektronix/tektronixDPO5000.py @@ -23,6 +23,7 @@ THE SOFTWARE. """ +from ivi import UnexpectedResponseException from .tektronixBaseScope import * @@ -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]) diff --git a/ivi/tektronix/tektronixDPO7000.py b/ivi/tektronix/tektronixDPO7000.py index 9ef5adf7..65408672 100644 --- a/ivi/tektronix/tektronixDPO7000.py +++ b/ivi/tektronix/tektronixDPO7000.py @@ -23,6 +23,7 @@ THE SOFTWARE. """ +from ivi import UnexpectedResponseException from .tektronixBaseScope import * @@ -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])