lint: fix whitespace issues in various modules

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

Change-Id: I1c57d6fe903f68510599390acfc1b38df7005fa4
Reviewed-on: https://chromium-review.googlesource.com/232020
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/scripts/gerrit.py b/scripts/gerrit.py
index 525c6b9..b56df44 100644
--- a/scripts/gerrit.py
+++ b/scripts/gerrit.py
@@ -9,8 +9,6 @@
 with the prefix "UserAct".
 """
 
-# pylint: disable=bad-continuation
-
 from __future__ import print_function
 
 import inspect
@@ -214,8 +212,8 @@
 def UserActTodo(opts):
   """List CLs needing your review"""
   emails, reviewers, owners = _MyUserInfo()
-  cls = FilteredQuery(opts, '( %s ) status:open NOT ( %s )' %
-                            (' OR '.join(reviewers), ' OR '.join(owners)))
+  cls = FilteredQuery(opts, ('( %s ) status:open NOT ( %s )' %
+                             (' OR '.join(reviewers), ' OR '.join(owners))))
   cls = [x for x in cls if not IsApprover(x, emails)]
   lims = limits(cls)
   for cl in cls:
@@ -379,8 +377,8 @@
                       help='Query internal Chromium Gerrit instance')
   parser.add_argument('-g', '--gob',
                       default=constants.EXTERNAL_GOB_INSTANCE,
-                      help='Gerrit (on borg) instance to query (default: %s)' %
-                           (constants.EXTERNAL_GOB_INSTANCE))
+                      help=('Gerrit (on borg) instance to query (default: %s)' %
+                            (constants.EXTERNAL_GOB_INSTANCE)))
   parser.add_argument('--sort', default='number',
                       help='Key to sort on (number, project)')
   parser.add_argument('--raw', default=False, action='store_true',