From 0b8501e010ee43fb00e2127978125e980edddaff Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Tue, 3 Jul 2018 14:16:16 +0100 Subject: [PATCH] wa/instruments: pep8 fixes --- wa/instruments/dmesg.py | 1 + wa/instruments/energy_measurement.py | 29 ++++++++++++++-------------- wa/instruments/hwmon.py | 3 ++- wa/instruments/trace_cmd.py | 20 +++++++++---------- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/wa/instruments/dmesg.py b/wa/instruments/dmesg.py index 5099242a..b4b5f069 100644 --- a/wa/instruments/dmesg.py +++ b/wa/instruments/dmesg.py @@ -21,6 +21,7 @@ from wa.framework.exception import InstrumentError from wa.framework.instrument import slow from wa.utils.misc import ensure_file_directory_exists as _f + class DmesgInstrument(Instrument): # pylint: disable=no-member,attribute-defined-outside-init """ diff --git a/wa/instruments/energy_measurement.py b/wa/instruments/energy_measurement.py index 22472b27..98ea30dd 100644 --- a/wa/instruments/energy_measurement.py +++ b/wa/instruments/energy_measurement.py @@ -48,7 +48,7 @@ class EnergyInstrumentBackend(Plugin): instrument = None def get_parameters(self): - return {p.name : p for p in self.parameters} + return {p.name: p for p in self.parameters} def validate_parameters(self, params): pass @@ -66,7 +66,7 @@ class EnergyInstrumentBackend(Plugin): class DAQBackend(EnergyInstrumentBackend): name = 'daq' - description=""" + description = """ National Instruments Data Acquisition device For more information about the device, please see the NI website: @@ -145,7 +145,7 @@ class DAQBackend(EnergyInstrumentBackend): assumes DAQ 6363 and similar with AI channels on connectors 0-7 and 16-23. """) - ] + ] instrument = DaqInstrument @@ -161,7 +161,7 @@ class DAQBackend(EnergyInstrumentBackend): class EnergyProbeBackend(EnergyInstrumentBackend): name = 'energy_probe' - description=""" + description = """ Arm Energy Probe caiman version This backend relies on caiman utility: @@ -205,7 +205,7 @@ class EnergyProbeBackend(EnergyInstrumentBackend): class ArmEnergyProbeBackend(EnergyInstrumentBackend): name = 'arm_energy_probe' - description=""" + description = """ Arm Energy Probe arm-probe version An alternative Arm Energy Probe backend that relies on arm-probe utility: @@ -251,7 +251,7 @@ class ArmEnergyProbeBackend(EnergyInstrumentBackend): class AcmeCapeBackend(EnergyInstrumentBackend): name = 'acme_cape' - description=""" + description = """ BayLibre ACME cape This backend relies on iio-capture utility: @@ -309,10 +309,11 @@ class AcmeCapeBackend(EnergyInstrumentBackend): iio_device=iio_device, buffer_size=buffer_size) return ret + class MonsoonBackend(EnergyInstrumentBackend): name = 'monsoon' - description=""" + description = """ Monsoon Solutions power monitor To use this instrument, you need to install the monsoon.py script available @@ -345,7 +346,7 @@ class MonsoonBackend(EnergyInstrumentBackend): class JunoEnergyBackend(EnergyInstrumentBackend): name = 'juno_readenergy' - description=""" + description = """ Arm Juno development board on-board energy meters For more information about Arm Juno board see: @@ -373,15 +374,15 @@ class EnergyMeasurement(Instrument): Specify the energy instruments to be enabled. """), Parameter('instrument_parameters', kind=dict, default={}, - description=""" - Specify the parameters used to initialize the desired - instruments. To see parameters available for a particular - instrument, run + description=""" + Specify the parameters used to initialize the desired + instruments. To see parameters available for a particular + instrument, run wa show - See help for ``instrument`` parameter to see available - options for . + See help for ``instrument`` parameter to see available + options for . """), Parameter('sites', kind=list_or_string, diff --git a/wa/instruments/hwmon.py b/wa/instruments/hwmon.py index e037bab4..1cc2d4bc 100644 --- a/wa/instruments/hwmon.py +++ b/wa/instruments/hwmon.py @@ -21,6 +21,7 @@ from wa.framework.instrument import fast MOMENTARY_QUANTITIES = ['temperature', 'power', 'voltage', 'current', 'fps'] CUMULATIVE_QUANTITIES = ['energy', 'tx', 'tx/rx', 'frames'] + class HwmonInstrument(Instrument): name = 'hwmon' @@ -64,7 +65,7 @@ class HwmonInstrument(Instrument): for label, measurement_after in measurements_after.items(): if label not in measurements_before: - continue # We've already warned about this + continue # We've already warned about this measurement_before = measurements_before[label] if measurement_after.channel.kind in MOMENTARY_QUANTITIES: diff --git a/wa/instruments/trace_cmd.py b/wa/instruments/trace_cmd.py index ada9693c..4a2faf2a 100644 --- a/wa/instruments/trace_cmd.py +++ b/wa/instruments/trace_cmd.py @@ -165,16 +165,16 @@ class TraceCmdInstrument(Instrument): if not self.target.is_rooted: raise InstrumentError('trace-cmd instrument cannot be used on an unrooted device.') collector_params = dict( - events=self.events, - functions=self.functions, - buffer_size=self.buffer_size, - buffer_size_step=1000, - automark=False, - autoreport=True, - autoview=False, - no_install=self.no_install, - strict=False, - report_on_target=False, + events=self.events, + functions=self.functions, + buffer_size=self.buffer_size, + buffer_size_step=1000, + automark=False, + autoreport=True, + autoview=False, + no_install=self.no_install, + strict=False, + report_on_target=False, ) if self.report and self.report_on_target: collector_params['autoreport'] = True