Merge pull request #209 from ep1cman/revent_fixes

Pylint fixes

wlauto/commands/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/commands/show.py

@@ -111,4 +111,3 @@ def format_extension_parameters(extension, out, width, shift=4):
         param_texts.append(indent(param_text, shift))
 
     out.write(format_column('\n'.join(param_texts), width))
-

wlauto/common/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/common/android/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/common/gem5/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/common/linux/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/core/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/core/bootstrap.py

@@ -211,4 +211,3 @@ if os.path.isfile(_packages_file):
 
 for config in _env_configs:
     settings.update(config)
-

wlauto/core/exttype.py

@@ -32,4 +32,3 @@ def get_extension_type(ext):
         if isinstance(ext, cls):
             return name
     raise ValueError('Unknown extension type: {}'.format(ext.__class__.__name__))
-

wlauto/core/instrumentation.py

@@ -396,4 +396,3 @@ class Instrument(Extension):
 
     def __repr__(self):
         return 'Instrument({})'.format(self.name)
-

wlauto/core/result.py

@@ -327,4 +327,3 @@ class Metric(object):
         return '<{}>'.format(result)
 
     __repr__ = __str__
-

wlauto/core/signal.py

@@ -186,4 +186,3 @@ def send(signal, sender, *args, **kwargs):
 
     """
     dispatcher.send(signal, sender, *args, **kwargs)
-

wlauto/core/workload.py

@@ -101,4 +101,3 @@ class Workload(Extension):
 
     def __str__(self):
         return '<Workload {}>'.format(self.name)
-

wlauto/devices/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/devices/android/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/devices/android/juno/__init__.py

@@ -218,4 +218,3 @@ class Juno(BigLittleDevice):
     def get_android_id(self):
         # Android ID currenlty not set properly in Juno Android builds.
         return 'abad1deadeadbeef'
-

wlauto/devices/android/odroidxu3/__init__.py

@@ -35,4 +35,3 @@ class OdroidXU3(AndroidDevice):
                   description='Serial port on which the device is connected'),
         Parameter('baudrate', default=115200, kind=int, description='Serial connection baud rate'),
     ]
-

wlauto/devices/android/tc2/__init__.py

@@ -847,4 +847,3 @@ def _slow_sendline(target, line):
         target.send(c)
         time.sleep(0.1)
     target.sendline('')
-

wlauto/devices/linux/XE503C12/__init__.py

@@ -33,4 +33,3 @@ class Xe503c12Chormebook(LinuxDevice):
     ]
 
     abi = 'armeabi'
-

wlauto/devices/linux/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/devices/linux/chromeos_test_image/__init__.py

@@ -97,4 +97,3 @@ class ChromeOsDevice(LinuxDevice):
         else:
             pass
         self.ui_status = None
-

wlauto/devices/linux/odroidxu3_linux/__init__.py

@@ -32,4 +32,3 @@ class OdroidXU3LinuxDevice(LinuxDevice):
     ]
 
     abi = 'armeabi'
-

wlauto/external/daq_server/src/daqpower/log.py

@@ -55,4 +55,3 @@ logObserver.start()
 
 def start_logging(level, fmt='%(asctime)s %(levelname)-8s: %(message)s'):
     logging.basicConfig(level=getattr(logging, level), format=fmt)
-

wlauto/instrumentation/delay/__init__.py

@@ -196,4 +196,3 @@ class DelayInstrument(Instrument):
         if self.active_cooling and not self.device.has('active_cooling'):
             message = 'Your device does not support active cooling. Did you configure it with an approprite module?'
             raise InstrumentError(message)
-

wlauto/instrumentation/dmesg/__init__.py

@@ -58,5 +58,3 @@ class DmesgInstrument(Instrument):
     def teardown(self, context):  # pylint: disable=unused-argument
         if self.loglevel:
             self.device.set_sysfile_value(self.loglevel_file, self.old_loglevel, verify=False)
-
-

wlauto/instrumentation/energy_probe/__init__.py

@@ -144,4 +144,3 @@ class EnergyProbe(Instrument):
         writer = csv.DictWriter(f, self.attributes)
         writer.writeheader()
         writer.writerows(new_data)
-

wlauto/instrumentation/hwmon/__init__.py

@@ -123,4 +123,3 @@ class HwmonInstrument(Instrument):
             except ValueError, e:
                 self.logger.error('Could not collect all {} readings for {}'.format(sensor.kind, sensor.label))
                 self.logger.error('Got: {}'.format(e))
-

wlauto/instrumentation/juno_energy/__init__.py

@@ -106,4 +106,3 @@ class JunoEnergy(Instrument):
             if self.device.name.lower() != 'juno':
                 message = 'juno_energy instrument is only supported on juno devices; found {}'
                 raise InstrumentError(message.format(self.device.name))
-

wlauto/instrumentation/netstats/__init__.py

@@ -189,4 +189,3 @@ class NetstatsInstrument(Instrument):
     def finalize(self, context):
         if self.uninstall_on_completion:
             self.collector.teardown()
-

wlauto/instrumentation/poller/__init__.py

@@ -118,4 +118,3 @@ class FilePoller(Instrument):
             label_parts.append(pp[-1])  # always use file name even if same for all
             labels.append('-'.join(label_parts))
         return labels
-

wlauto/instrumentation/screenon/__init__.py

@@ -77,4 +77,3 @@ class ScreenOnInstrument(Instrument):
     def teardown(self, context):
         if self.polling_period:
             self.monitor.stop()
-

wlauto/modules/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/modules/cpuidle.py

@@ -114,4 +114,3 @@ class Cpuidle(Module):
     def _on_device_init(self, context):  # pylint: disable=unused-argument
         if not self.device.file_exists(self.root_path):
             raise DeviceError('Device kernel does not appear to have cpuidle enabled.')
-

wlauto/modules/flashing.py

@@ -245,4 +245,3 @@ def validate_image_bundle(bundle):
             except KeyError:
                 msg = 'Tarball {} does not appear to be a valid image bundle (did not see config.txt).'
                 raise ConfigError(msg.format(bundle))
-

wlauto/resource_getters/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/result_processors/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/result_processors/cpustate.py

@@ -264,4 +264,3 @@ class CpuStatesProcessor(ResultProcessor):
                         for i, c in enumerate(powerstate_report.core_names)]
             writer.writerow(headers)
             writer.writerows(powerstate_rows)
-

wlauto/result_processors/dvfs.py

@@ -374,4 +374,3 @@ class DVFS(ResultProcessor):
                 for i in range(self.device.number_of_cores * self.multiply_factor):
                     temprow.append("{0:.3f}".format(temp["cpu{}".format(i)][offline_value]))
                 writer.writerow(temprow)
-

wlauto/result_processors/status.py

@@ -48,4 +48,3 @@ class StatusTxtReporter(ResultProcessor):
                             for ir in result.iteration_results]
             write_table(status_lines, wfh, align='<<>><')
         context.add_artifact('run_status_summary', 'status.txt', 'export')
-

wlauto/result_processors/syeg.py

@@ -146,5 +146,3 @@ class SyegResult(object):
         if not match:
             raise AttributeError(name)
         return self.runs[int(match.group(1)) - 1]
-
-

wlauto/tests/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/tests/test_device.py

@@ -96,4 +96,3 @@ class RuntimeParametersTest(TestCase):
 def _instantiate(cls, *args, **kwargs):
     # Needed to get around Extension's __init__ checks
     return cls(*args, **kwargs)
-

wlauto/tests/test_diff.py

@@ -40,5 +40,3 @@ class InterruptDiffTest(TestCase):
         with open(expected_result_file) as fh:
             expected_diff = fh.read()
         assert_equal(output_diff, expected_diff)
-
-

wlauto/tests/test_extension_loader.py

@@ -48,4 +48,3 @@ class ExtensionLoaderTest(TestCase):
         assert_equal(len(devices), 1)
         assert_equal(devices[0].name, 'test-device')
         assert_equal(len(loader.list_extensions()), 1)
-

wlauto/tests/test_instrumentation.py

@@ -233,4 +233,3 @@ class InstrumentationTest(TestCase):
 def _instantiate(cls):
     # Needed to get around Extension's __init__ checks
     return cls()
-

wlauto/tests/test_utils.py

@@ -88,4 +88,3 @@ class TestTypes(TestCase):
         assert_equal(arguments('--foo 7 --bar "fizz buzz"'),
                      ['--foo', '7', '--bar', 'fizz buzz'])
         assert_equal(arguments(['test', 42]), ['test', '42'])
-

wlauto/tools/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/tools/extdoc.py

@@ -131,4 +131,3 @@ def _parse_lambda(text):
     func_text = re.sub(r'\b{}\b'.format(param), 'value', func_text)
 
     return func_text
-

wlauto/utils/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/utils/cli.py

@@ -24,4 +24,3 @@ def init_argument_parser(parser):
                         help='Enable debug mode. Note: this implies --verbose.')
     parser.add_argument('--version', action='version', version='%(prog)s {}'.format(get_wa_version()))
     return parser
-

wlauto/utils/cros_sdk.py

@@ -129,4 +129,3 @@ def _read_line_from_queue(queue, timeout=0, logger=None):
     if logger and line:
         logger.debug(line)
     return line
-

wlauto/utils/doc.py

@@ -304,4 +304,3 @@ def get_rst_from_extension(ext):
     if params_rst:
         text += underline('parameters', '~') + params_rst
     return text + '\n'
-

wlauto/utils/serial_port.py

@@ -20,7 +20,7 @@ from distutils.version import StrictVersion as V
 
 import serial
 
-# pylint: disable=ungrouped-imports
+# pylint: disable=ungrouped-imports, wrong-import-position
 import pexpect
 if V(pexpect.__version__) < V('4.0.0'):
     import fdpexpect  # pylint: disable=import-error

wlauto/utils/terminalsize.py

@@ -90,4 +90,3 @@ def _get_terminal_size_linux():
 if __name__ == "__main__":
     sizex, sizey = get_terminal_size()
     print 'width =', sizex, 'height =', sizey
-

wlauto/utils/trace_cmd.py

@@ -286,4 +286,3 @@ class TraceCmdTrace(object):
             else:
                 if self.filter_markers and inside_marked_region:
                     logger.warning('Did not encounter a stop marker in trace')
-

wlauto/utils/uefi.py

@@ -231,5 +231,3 @@ class UefiMenu(object):
         self.options = {}
         self.prompt = None
         self.empty_buffer()
-
-

wlauto/workloads/__init__.py

@@ -12,5 +12,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-

wlauto/workloads/andebench/__init__.py

@@ -92,4 +92,3 @@ class Andebench(AndroidUiAutoBenchmark):
                     results[data['key']] = data['value']
         for key, value in results.iteritems():
             context.result.add_metric(key, value)
-

wlauto/workloads/angrybirds/__init__.py

@@ -27,4 +27,3 @@ class AngryBirds(GameWorkload):
     """
     package = 'com.rovio.angrybirds'
     activity = 'com.rovio.ka3d.App'
-

wlauto/workloads/angrybirds_rio/__init__.py

@@ -27,4 +27,3 @@ class AngryBirdsRio(GameWorkload):
     """
     package = 'com.rovio.angrybirdsrio'
     activity = 'com.rovio.ka3d.App'
-

wlauto/workloads/anomaly2/__init__.py

@@ -60,4 +60,3 @@ class Anomaly2(GameWorkload):
 
     def teardown(self, context):
         self.device.execute('am force-stop {}'.format(self.package))
-

wlauto/workloads/audio/__init__.py

@@ -100,4 +100,3 @@ class Audio(Workload):
     def _download_audio_file(self):
         self.logger.debug('Downloading audio file from {}'.format(DEFAULT_AUDIO_FILE_URL))
         urllib.urlretrieve(DEFAULT_AUDIO_FILE_URL, self.audio_file)
-

wlauto/workloads/autotest/__init__.py

@@ -105,4 +105,3 @@ class ChromeAutotest(Workload):
         parts = [self.test_that, self.device.host, self.test]
         parts.append(str(self.test_that_args))
         return ' '.join(parts)
-

wlauto/workloads/camerarecord/__init__.py

@@ -71,7 +71,7 @@ class Camerarecord(UiAutomatorWorkload):
         # Collect framestats
         framestats_file = self.device.path.join(self.device.working_directory,
                                                 'framestats.txt')
-        self.device.execute('dumpsys gfxinfo {} > {}'\
+        self.device.execute('dumpsys gfxinfo {} > {}'
                             .format(self.package, framestats_file))
         self.device.pull_file(framestats_file,
                               context.output_directory,

wlauto/workloads/castlemaster/__init__.py

@@ -27,4 +27,3 @@ class CastleMaster(GameWorkload):
     package = 'com.alphacloud.castlemaster'
     activity = 'com.unity3d.player.UnityPlayerActivity'
     install_timeout = 500
-

wlauto/workloads/cfbench/__init__.py

@@ -68,5 +68,3 @@ class Cfbench(AndroidUiAutoBenchmark):
                 else:
                     value = int(child.text)
                 context.result.add_metric(child.attrib['name'], value)
-
-

wlauto/workloads/glbenchmark/__init__.py

@@ -155,4 +155,3 @@ class Glb(AndroidUiAutoBenchmark):
                     metric = metric + '_' + str(match_count // 2)
                     context.result.add_metric(metric, value, units)
                     match_count += 1
-

wlauto/workloads/googlemap/__init__.py

@@ -35,5 +35,3 @@ class GoogleMap(GameWorkload):
     package = 'com.google.android.apps.maps'
     activity = 'com.google.android.maps.MapsActivity'
     loading_time = 20
-
-

wlauto/workloads/gunbros2/__init__.py

@@ -39,4 +39,3 @@ class GunBros(GameWorkload):
     ondevice_asset_root = '/data'
     loading_time = 20
     install_timeout = 500
-

wlauto/workloads/nenamark/__init__.py

@@ -63,4 +63,3 @@ class Nenamark(AndroidBenchmark):
                     score = match.group(1)
                     context.result.add_metric('nenamark score', score)
                     break
-

wlauto/workloads/power_loadtest/__init__.py

@@ -119,4 +119,3 @@ class PowerLoadtest(Workload):
             parts.append('-b {}'.format(self.board))
         parts.append(str(self.test_that_args))
         return ' '.join(parts)
-

wlauto/workloads/quadrant/__init__.py

@@ -109,4 +109,3 @@ class Quadrant(AndroidUiAutoBenchmark):
                                                       TYPE_UNITS[test_type])
                         context.result.add_metric(data['metric'] + '_score', data['score'])
                         break
-

wlauto/workloads/realracing3/__init__.py

@@ -31,5 +31,3 @@ class RealRacing3(GameWorkload):
     loading_time = 90
     asset_file = 'com.ea.games.r3_row.tar.gz'
     saved_state_file = 'rr3-save.tar.gz'
-
-

wlauto/workloads/sqlite/__init__.py

@@ -45,4 +45,3 @@ class Sqlite(AndroidUiAutoBenchmark):
                 except ValueError:
                     self.logger.warn("Reported results do not match expected format (seconds)")
                 context.result.add_metric(metric, value, 'Seconds', lower_is_better=True)
-

wlauto/workloads/thechase/__init__.py

@@ -43,4 +43,3 @@ class TheChase(ApkWorkload):
 
     def run(self, context):
         time.sleep(self.duration)
-

wlauto/workloads/vellamo/__init__.py

@@ -233,4 +233,3 @@ class VellamoResultParser(HTMLParser):
                     self.benchmarks[-1].add_metric(data)
                 else:
                     self.failed = True
-

wlauto/workloads/video/__init__.py

@@ -135,4 +135,3 @@ class VideoWorkload(Workload):
             for resolution in self.parameters['resolution'].allowed_values:
                 if resolution in filename:
                     self.video_files[resolution].append(os.path.join(self.video_directory, filename))
-