Merge pull request #9735 from nathanielmanistaatgoogle/lint-fixes

Lint fixes.

.pylintrc

@@ -29,10 +29,7 @@
 #TODO: Enable too-many-return-statements
 #TODO: Enable too-many-nested-blocks
 #TODO: Enable super-init-not-called
-#TODO: Enable simplifiable-if-statement
 #TODO: Enable no-self-use
 #TODO: Enable no-member
-#TODO: Enable logging-format-interpolation
-#TODO: Enable dangerous-default-value
 
-disable=missing-docstring,too-few-public-methods,too-many-arguments,no-init,duplicate-code,invalid-name,suppressed-message,locally-disabled,protected-access,no-name-in-module,unused-argument,fixme,wrong-import-order,no-value-for-parameter,cyclic-import,unused-variable,redefined-outer-name,unused-import,too-many-instance-attributes,broad-except,too-many-locals,too-many-lines,redefined-variable-type,next-method-called,import-error,useless-else-on-loop,too-many-return-statements,too-many-nested-blocks,super-init-not-called,simplifiable-if-statement,no-self-use,no-member,logging-format-interpolation,dangerous-default-value
+disable=missing-docstring,too-few-public-methods,too-many-arguments,no-init,duplicate-code,invalid-name,suppressed-message,locally-disabled,protected-access,no-name-in-module,unused-argument,fixme,wrong-import-order,no-value-for-parameter,cyclic-import,unused-variable,redefined-outer-name,unused-import,too-many-instance-attributes,broad-except,too-many-locals,too-many-lines,redefined-variable-type,next-method-called,import-error,useless-else-on-loop,too-many-return-statements,too-many-nested-blocks,super-init-not-called,no-self-use,no-member

src/python/grpcio/grpc/_auth.py

@@ -48,11 +48,8 @@ class GoogleCallCredentials(grpc.AuthMetadataPlugin):
 
         # Hack to determine if these are JWT creds and we need to pass
         # additional_claims when getting a token
-        if 'additional_claims' in inspect.getargspec(
+        self._is_jwt = 'additional_claims' in inspect.getargspec(
-                credentials.get_access_token).args:
+            credentials.get_access_token).args
-            self._is_jwt = True
-        else:
-            self._is_jwt = False
 
     def __call__(self, context, callback):
         # MetadataPlugins cannot block (see grpc.beta.interfaces.py)

src/python/grpcio/grpc/_common.py

@@ -92,7 +92,7 @@ def decode(b):
         try:
             return b.decode('utf8')
         except UnicodeDecodeError:
-            logging.exception('Invalid encoding on {}'.format(b))
+            logging.exception('Invalid encoding on %s', b)
             return b.decode('latin1')
 
 
@@ -153,13 +153,7 @@ class CleanupThread(threading.Thread):
     we accomplish this by overriding the join() method.
     """
 
-    def __init__(self,
+    def __init__(self, behavior, *args, **kwargs):
-                 behavior,
-                 group=None,
-                 target=None,
-                 name=None,
-                 args=(),
-                 kwargs={}):
         """Constructor.
 
         Args:
@@ -167,17 +161,10 @@ class CleanupThread(threading.Thread):
                 argument, timeout, indicating the maximum duration of
                 `behavior`, or None indicating `behavior` has no deadline.
                 `behavior` must be idempotent.
-      group (None): should be None.  Reseved for future extensions
+            args: Positional arguments passed to threading.Thread constructor.
-          when ThreadGroup is implemented.
+            kwargs: Keyword arguments passed to threading.Thread constructor.
-      target (function): The function to invoke when this thread is
-          run.  Defaults to None.
-      name (str): The name of this thread.  Defaults to None.
-        args (tuple[object]): A tuple of arguments to pass to `target`.
-      kwargs (dict[str,object]): A dictionary of keyword arguments to
-           pass to `target`.
         """
-        super(CleanupThread, self).__init__(
+        super(CleanupThread, self).__init__(*args, **kwargs)
-            group=group, target=target, name=name, args=args, kwargs=kwargs)
         self._behavior = behavior
 
     def join(self, timeout=None):