Browse Source

Enable redefined-variable-type lint

Nathaniel Manista 8 years ago
parent
commit
37c83ffbed
2 changed files with 5 additions and 3 deletions
  1. 1 2
      .pylintrc
  2. 4 1
      src/python/grpcio/grpc/_channel.py

+ 1 - 2
.pylintrc

@@ -31,9 +31,8 @@ notes=FIXME,XXX
 # disable=cyclic-import suppressions.
 # disable=cyclic-import suppressions.
 #TODO: Enable too-many-instance-attributes
 #TODO: Enable too-many-instance-attributes
 #TODO: Enable too-many-lines
 #TODO: Enable too-many-lines
-#TODO: Enable redefined-variable-type
 #TODO: Enable import-error
 #TODO: Enable import-error
 #TODO: Enable useless-else-on-loop
 #TODO: Enable useless-else-on-loop
 #TODO: Enable too-many-nested-blocks
 #TODO: Enable too-many-nested-blocks
 
 
-disable=missing-docstring,too-few-public-methods,no-init,duplicate-code,invalid-name,locally-disabled,protected-access,no-name-in-module,wrong-import-order,cyclic-import,too-many-instance-attributes,too-many-lines,redefined-variable-type,import-error,useless-else-on-loop,too-many-nested-blocks
+disable=missing-docstring,too-few-public-methods,no-init,duplicate-code,invalid-name,locally-disabled,protected-access,no-name-in-module,wrong-import-order,cyclic-import,too-many-instance-attributes,too-many-lines,import-error,useless-else-on-loop,too-many-nested-blocks

+ 4 - 1
src/python/grpcio/grpc/_channel.py

@@ -849,7 +849,10 @@ def _poll_connectivity(state, channel, initial_try_to_connect):
                     _common.CYGRPC_CONNECTIVITY_STATE_TO_CHANNEL_CONNECTIVITY[
                     _common.CYGRPC_CONNECTIVITY_STATE_TO_CHANNEL_CONNECTIVITY[
                         connectivity])
                         connectivity])
                 if not state.delivering:
                 if not state.delivering:
-                    callbacks = _deliveries(state)
+                    # NOTE(nathaniel): The field is only ever used as a
+                    # sequence so it's fine that both lists and tuples are
+                    # assigned to it.
+                    callbacks = _deliveries(state)  # pylint: disable=redefined-variable-type
                     if callbacks:
                     if callbacks:
                         _spawn_delivery(state, callbacks)
                         _spawn_delivery(state, callbacks)