commit e65f375a84c19a1ffbb64270bf8bd07cfcc7c8c6
author Mike Frysinger <vapier@chromium.org> Mon Dec 08 00:46:39 2014 -0500
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri Jan 16 02:22:55 2015 +0000
tree d1e98a1b9307086cb36062bb98fa327d4ee43000
parent b0b95837b87627db30ee1287875b8e8b4f8076db

lint: scripts: clean up some more warnings after deleting local disables

BUG=chromium:431514
TEST=no more lint errors
TEST=`./cbuildbot/run_tests` passes

Change-Id: I74c77dc197e382f48dcd79300e562051e5b4c351
Reviewed-on: https://chromium-review.googlesource.com/240900
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/autotest_quickmerge_unittest.py

diff --git a/scripts/autotest_quickmerge_unittest.py b/scripts/autotest_quickmerge_unittest.py
index 16b687f..4eb8c87 100755
--- a/scripts/autotest_quickmerge_unittest.py
+++ b/scripts/autotest_quickmerge_unittest.py
@@ -5,8 +5,6 @@
 
 """Unit tests for autotest_quickmerge."""
 
-# pylint: disable=bad-continuation
-
 from __future__ import print_function
 
 import os
@@ -69,10 +67,11 @@
 TEST_PACKAGE_PV = 'little_puppy-3.14159'
 TEST_PORTAGE_ROOT = '/bib/bob/'
 TEST_PACKAGE_OLDCONTENTS = {
-  u'/by/the/prickling/of/my/thumbs'   : (u'obj', '1234', '4321'),
-  u'/something/wicked/this/way/comes' : (u'dir',)
+    u'/by/the/prickling/of/my/thumbs': (u'obj', '1234', '4321'),
+    u'/something/wicked/this/way/comes': (u'dir',)
 }
 
+
 class ItemizeChangesFromRsyncOutput(cros_test_lib.TestCase):
   """Test autotest_quickmerge.ItemizeChangesFromRsyncOutput."""
 
@@ -173,25 +172,25 @@
     RESULT_DICIONARY.update(EXPECTED_NEW_ENTRIES)
 
     mock_vartree.dbapi.writeContentsToContentsFile(mock_package,
-      RESULT_DICIONARY)
+                                                   RESULT_DICIONARY)
 
     change_report = autotest_quickmerge.ItemizeChangesFromRsyncOutput(
-      RSYNC_TEST_OUTPUT, RSYNC_TEST_DESTINATION_PATH)
+        RSYNC_TEST_OUTPUT, RSYNC_TEST_DESTINATION_PATH)
     autotest_quickmerge.UpdatePackageContents(change_report, TEST_PACKAGE_CP,
-        TEST_PORTAGE_ROOT)
+                                              TEST_PORTAGE_ROOT)
 
 
 class PortageAPITest(cros_test_lib.TestCase):
   """Ensures that required portage API exists."""
+
   def runTest(self):
     try:
-      # pylint: disable=F0401
       import portage
     except ImportError:
       self.skipTest('Portage not available in test environment. Re-run test '
                     'in chroot.')
     try:
-      # pylint: disable=E1101
+      # pylint: disable=no-member
       f = portage.vardbapi.writeContentsToContentsFile
     except AttributeError:
       self.fail('Required writeContentsToContentsFile function does '
@@ -201,5 +200,6 @@
                           'Required writeContentsToContentsFile is not '
                           'a function.')
 
+
 if __name__ == '__main__':
   cros_test_lib.main()