[Android] Fix new pylint errors in build/android/.

build/android/pylib/device/device_utils.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provides a variety of device interactions based on adb.
 
 Eventually, this will be based on adb_wrapper.
 """
 # pylint: disable=W0613
 
@@ skipping 74 matching lines @@
       self.old_interface = device
     elif not device:
       self.adb = adb_wrapper.AdbWrapper('')
       self.old_interface = pylib.android_commands.AndroidCommands()
     else:
       raise ValueError('Unsupported type passed for argument "device"')
     self._commands_installed = None
     self._default_timeout = default_timeout
     self._default_retries = default_retries
     self._cache = {}
-    assert(hasattr(self, decorators.DEFAULT_TIMEOUT_ATTR))
-    assert(hasattr(self, decorators.DEFAULT_RETRIES_ATTR))
+    assert hasattr(self, decorators.DEFAULT_TIMEOUT_ATTR)
+    assert hasattr(self, decorators.DEFAULT_RETRIES_ATTR)
 
   @decorators.WithTimeoutAndRetriesFromInstance()
   def IsOnline(self, timeout=None, retries=None):
     """Checks whether the device is online.
 
     Args:
       timeout: timeout in seconds
       retries: number of retries
 
     Returns:
@@ skipping 587 matching lines @@
     try:
       real_device_path = self.RunShellCommand(
           ['realpath', device_path], single_line=True, check_return=True)
     except device_errors.CommandFailedError:
       real_device_path = None
     if not real_device_path:
       return [(host_path, device_path)]
 
     # TODO(jbudorick): Move the md5 logic up into DeviceUtils or base
     # this function on mtime.
-    # pylint: disable=W0212
+    # pylint: disable=protected-access
     host_hash_tuples, device_hash_tuples = self.old_interface._RunMd5Sum(
         real_host_path, real_device_path)
-    # pylint: enable=W0212
+    # pylint: enable=protected-access
 
     if os.path.isfile(host_path):
       if (not device_hash_tuples
           or device_hash_tuples[0].hash != host_hash_tuples[0].hash):
         return [(host_path, device_path)]
       else:
         return []
     else:
       device_tuple_dict = dict((d.path, d.hash) for d in device_hash_tuples)
       to_push = []
@@ skipping 40 matching lines @@
     COMPRESSION_RATIO = 2.0 # unitless
 
     adb_call_time = ADB_CALL_PENALTY * adb_calls
     adb_push_setup_time = ADB_PUSH_PENALTY * file_count
     if is_zipping:
       zip_time = ZIP_PENALTY + byte_count / ZIP_RATE
       transfer_time = byte_count / (TRANSFER_RATE * COMPRESSION_RATIO)
     else:
       zip_time = 0
       transfer_time = byte_count / TRANSFER_RATE
-    return (adb_call_time + adb_push_setup_time + zip_time + transfer_time)
+    return adb_call_time + adb_push_setup_time + zip_time + transfer_time
 
   def _PushChangedFilesIndividually(self, files):
     for h, d in files:
       self.adb.Push(h, d)
 
   def _PushChangedFilesZipped(self, files):
     if not files:
       return
 
     with tempfile.NamedTemporaryFile(suffix='.zip') as zip_file:
@@ skipping 387 matching lines @@
     Returns:
       A Parallelizer operating over |devices|.
     """
     if not devices or len(devices) == 0:
       devices = pylib.android_commands.GetAttachedDevices()
     parallelizer_type = (parallelizer.Parallelizer if async
                          else parallelizer.SyncParallelizer)
     return parallelizer_type([
         d if isinstance(d, DeviceUtils) else DeviceUtils(d)
         for d in devices])