Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix and enable redefined-outer-name lint

Browse Source
pull/9967/head
Nathaniel Manista 8 years ago
parent b16d765c0c
commit af39256c01
7 changed files with 38 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .pylintrc
  2. 15
      src/python/grpcio/grpc/_channel.py
  3. 12
      src/python/grpcio/grpc/_common.py
  4. 2
      src/python/grpcio/grpc/_plugin_wrapping.py
  5. 20
      src/python/grpcio/grpc/_server.py
  6. 4
      src/python/grpcio/grpc/beta/_client_adaptations.py
  7. 18
      src/python/grpcio/grpc/beta/_server_adaptations.py

3
.pylintrc
Unescape View File

@ -26,7 +26,6 @@ notes=FIXME,XXX
# TODO(https://github.com/PyCQA/pylint/issues/59#issuecomment-283774279): # TODO(https://github.com/PyCQA/pylint/issues/59#issuecomment-283774279):
# enable cyclic-import after a 1.7-or-later pylint release that recognizes our # enable cyclic-import after a 1.7-or-later pylint release that recognizes our
# disable=cyclic-import suppressions. # disable=cyclic-import suppressions.
#TODO: Enable redefined-outer-name
#TODO: Enable too-many-instance-attributes #TODO: Enable too-many-instance-attributes
#TODO: Enable too-many-locals #TODO: Enable too-many-locals
#TODO: Enable too-many-lines #TODO: Enable too-many-lines
@ -38,4 +37,4 @@ notes=FIXME,XXX
#TODO: Enable too-many-nested-blocks #TODO: Enable too-many-nested-blocks
#TODO: Enable super-init-not-called #TODO: Enable super-init-not-called
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,wrong-import-order,cyclic-import,redefined-outer-name,too-many-instance-attributes,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 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,wrong-import-order,cyclic-import,too-many-instance-attributes,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

15
src/python/grpcio/grpc/_channel.py
Unescape View File

@ -387,13 +387,14 @@ class _Rendezvous(grpc.RpcError, grpc.Future, grpc.Call):
with self._state.condition: with self._state.condition:
while self._state.initial_metadata is None: while self._state.initial_metadata is None:
self._state.condition.wait() self._state.condition.wait()
return _common.application_metadata(self._state.initial_metadata) return _common.to_application_metadata(self._state.initial_metadata)
def trailing_metadata(self): def trailing_metadata(self):
with self._state.condition: with self._state.condition:
while self._state.trailing_metadata is None: while self._state.trailing_metadata is None:
self._state.condition.wait() self._state.condition.wait()
return _common.application_metadata(self._state.trailing_metadata) return _common.to_application_metadata(
self._state.trailing_metadata)
def code(self): def code(self):
with self._state.condition: with self._state.condition:
@ -473,7 +474,7 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable):
state = _RPCState(_UNARY_UNARY_INITIAL_DUE, None, None, None, None) state = _RPCState(_UNARY_UNARY_INITIAL_DUE, None, None, None, None)
operations = ( operations = (
cygrpc.operation_send_initial_metadata( cygrpc.operation_send_initial_metadata(
_common.cygrpc_metadata(metadata), _EMPTY_FLAGS), _common.to_cygrpc_metadata(metadata), _EMPTY_FLAGS),
cygrpc.operation_send_message(serialized_request, _EMPTY_FLAGS), cygrpc.operation_send_message(serialized_request, _EMPTY_FLAGS),
cygrpc.operation_send_close_from_client(_EMPTY_FLAGS), cygrpc.operation_send_close_from_client(_EMPTY_FLAGS),
cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS), cygrpc.operation_receive_initial_metadata(_EMPTY_FLAGS),
@ -563,7 +564,7 @@ class _UnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable):
)), event_handler) )), event_handler)
operations = ( operations = (
cygrpc.operation_send_initial_metadata( cygrpc.operation_send_initial_metadata(
_common.cygrpc_metadata(metadata), _common.to_cygrpc_metadata(metadata),
_EMPTY_FLAGS), cygrpc.operation_send_message( _EMPTY_FLAGS), cygrpc.operation_send_message(
serialized_request, _EMPTY_FLAGS), serialized_request, _EMPTY_FLAGS),
cygrpc.operation_send_close_from_client(_EMPTY_FLAGS), cygrpc.operation_send_close_from_client(_EMPTY_FLAGS),
@ -603,7 +604,7 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable):
None) None)
operations = ( operations = (
cygrpc.operation_send_initial_metadata( cygrpc.operation_send_initial_metadata(
_common.cygrpc_metadata(metadata), _EMPTY_FLAGS), _common.to_cygrpc_metadata(metadata), _EMPTY_FLAGS),
cygrpc.operation_receive_message(_EMPTY_FLAGS), cygrpc.operation_receive_message(_EMPTY_FLAGS),
cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),)
call_error = call.start_client_batch( call_error = call.start_client_batch(
@ -657,7 +658,7 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable):
event_handler) event_handler)
operations = ( operations = (
cygrpc.operation_send_initial_metadata( cygrpc.operation_send_initial_metadata(
_common.cygrpc_metadata(metadata), _EMPTY_FLAGS), _common.to_cygrpc_metadata(metadata), _EMPTY_FLAGS),
cygrpc.operation_receive_message(_EMPTY_FLAGS), cygrpc.operation_receive_message(_EMPTY_FLAGS),
cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),)
call_error = call.start_client_batch( call_error = call.start_client_batch(
@ -700,7 +701,7 @@ class _StreamStreamMultiCallable(grpc.StreamStreamMultiCallable):
event_handler) event_handler)
operations = ( operations = (
cygrpc.operation_send_initial_metadata( cygrpc.operation_send_initial_metadata(
_common.cygrpc_metadata(metadata), _EMPTY_FLAGS), _common.to_cygrpc_metadata(metadata), _EMPTY_FLAGS),
cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),) cygrpc.operation_receive_status_on_client(_EMPTY_FLAGS),)
call_error = call.start_client_batch( call_error = call.start_client_batch(
cygrpc.Operations(operations), event_handler) cygrpc.Operations(operations), event_handler)

12
src/python/grpcio/grpc/_common.py
Unescape View File

@ -97,22 +97,22 @@ def decode(b):
def channel_args(options): def channel_args(options):
channel_args = [] cygrpc_args = []
for key, value in options: for key, value in options:
if isinstance(value, six.string_types): if isinstance(value, six.string_types):
channel_args.append(cygrpc.ChannelArg(encode(key), encode(value))) cygrpc_args.append(cygrpc.ChannelArg(encode(key), encode(value)))
else: else:
channel_args.append(cygrpc.ChannelArg(encode(key), value)) cygrpc_args.append(cygrpc.ChannelArg(encode(key), value))
return cygrpc.ChannelArgs(channel_args) return cygrpc.ChannelArgs(cygrpc_args)
def cygrpc_metadata(application_metadata): def to_cygrpc_metadata(application_metadata):
return EMPTY_METADATA if application_metadata is None else cygrpc.Metadata( return EMPTY_METADATA if application_metadata is None else cygrpc.Metadata(
cygrpc.Metadatum(encode(key), encode(value)) cygrpc.Metadatum(encode(key), encode(value))
for key, value in application_metadata) for key, value in application_metadata)
def application_metadata(cygrpc_metadata): def to_application_metadata(cygrpc_metadata):
if cygrpc_metadata is None: if cygrpc_metadata is None:
return () return ()
else: else:

2
src/python/grpcio/grpc/_plugin_wrapping.py
Unescape View File

@ -66,7 +66,7 @@ class _WrappedCygrpcCallback(object):
def _invoke_success(self, metadata): def _invoke_success(self, metadata):
try: try:
cygrpc_metadata = _common.cygrpc_metadata(metadata) cygrpc_metadata = _common.to_cygrpc_metadata(metadata)
except Exception as exception: # pylint: disable=broad-except except Exception as exception: # pylint: disable=broad-except
self._invoke_failure(exception) self._invoke_failure(exception)
return return

20
src/python/grpcio/grpc/_server.py
Unescape View File

@ -142,14 +142,14 @@ def _abort(state, call, code, details):
effective_details = details if state.details is None else state.details effective_details = details if state.details is None else state.details
if state.initial_metadata_allowed: if state.initial_metadata_allowed:
operations = (cygrpc.operation_send_initial_metadata( operations = (cygrpc.operation_send_initial_metadata(
_common.EMPTY_METADATA, _EMPTY_FLAGS), _common.EMPTY_METADATA,
cygrpc.operation_send_status_from_server( _EMPTY_FLAGS), cygrpc.operation_send_status_from_server(
_common.cygrpc_metadata(state.trailing_metadata), _common.to_cygrpc_metadata(state.trailing_metadata),
effective_code, effective_details, _EMPTY_FLAGS),) effective_code, effective_details, _EMPTY_FLAGS),)
token = _SEND_INITIAL_METADATA_AND_SEND_STATUS_FROM_SERVER_TOKEN token = _SEND_INITIAL_METADATA_AND_SEND_STATUS_FROM_SERVER_TOKEN
else: else:
operations = (cygrpc.operation_send_status_from_server( operations = (cygrpc.operation_send_status_from_server(
_common.cygrpc_metadata(state.trailing_metadata), _common.to_cygrpc_metadata(state.trailing_metadata),
effective_code, effective_details, _EMPTY_FLAGS),) effective_code, effective_details, _EMPTY_FLAGS),)
token = _SEND_STATUS_FROM_SERVER_TOKEN token = _SEND_STATUS_FROM_SERVER_TOKEN
call.start_server_batch( call.start_server_batch(
@ -250,7 +250,7 @@ class _Context(grpc.ServicerContext):
self._state.disable_next_compression = True self._state.disable_next_compression = True
def invocation_metadata(self): def invocation_metadata(self):
return _common.application_metadata(self._rpc_event.request_metadata) return _common.to_application_metadata(self._rpc_event.request_metadata)
def peer(self): def peer(self):
return _common.decode(self._rpc_event.operation_call.peer()) return _common.decode(self._rpc_event.operation_call.peer())
@ -262,7 +262,8 @@ class _Context(grpc.ServicerContext):
else: else:
if self._state.initial_metadata_allowed: if self._state.initial_metadata_allowed:
operation = cygrpc.operation_send_initial_metadata( operation = cygrpc.operation_send_initial_metadata(
_common.cygrpc_metadata(initial_metadata), _EMPTY_FLAGS) _common.to_cygrpc_metadata(initial_metadata),
_EMPTY_FLAGS)
self._rpc_event.operation_call.start_server_batch( self._rpc_event.operation_call.start_server_batch(
cygrpc.Operations((operation,)), cygrpc.Operations((operation,)),
_send_initial_metadata(self._state)) _send_initial_metadata(self._state))
@ -273,7 +274,7 @@ class _Context(grpc.ServicerContext):
def set_trailing_metadata(self, trailing_metadata): def set_trailing_metadata(self, trailing_metadata):
with self._state.condition: with self._state.condition:
self._state.trailing_metadata = _common.cygrpc_metadata( self._state.trailing_metadata = _common.to_cygrpc_metadata(
trailing_metadata) trailing_metadata)
def set_code(self, code): def set_code(self, code):
@ -436,7 +437,8 @@ def _send_response(rpc_event, state, serialized_response):
def _status(rpc_event, state, serialized_response): def _status(rpc_event, state, serialized_response):
with state.condition: with state.condition:
if state.client is not _CANCELLED: if state.client is not _CANCELLED:
trailing_metadata = _common.cygrpc_metadata(state.trailing_metadata) trailing_metadata = _common.to_cygrpc_metadata(
state.trailing_metadata)
code = _completion_code(state) code = _completion_code(state)
details = _details(state) details = _details(state)
operations = [ operations = [

4
src/python/grpcio/grpc/beta/_client_adaptations.py
Unescape View File

@ -620,8 +620,8 @@ class _GenericStub(face.GenericStub):
class _DynamicStub(face.DynamicStub): class _DynamicStub(face.DynamicStub):
def __init__(self, generic_stub, group, cardinalities): def __init__(self, backing_generic_stub, group, cardinalities):
self._generic_stub = generic_stub self._generic_stub = backing_generic_stub
self._group = group self._group = group
self._cardinalities = cardinalities self._cardinalities = cardinalities

18
src/python/grpcio/grpc/beta/_server_adaptations.py
Unescape View File

@ -78,7 +78,7 @@ class _FaceServicerContext(face.ServicerContext):
return _ServerProtocolContext(self._servicer_context) return _ServerProtocolContext(self._servicer_context)
def invocation_metadata(self): def invocation_metadata(self):
return _common.cygrpc_metadata( return _common.to_cygrpc_metadata(
self._servicer_context.invocation_metadata()) self._servicer_context.invocation_metadata())
def initial_metadata(self, initial_metadata): def initial_metadata(self, initial_metadata):
@ -351,27 +351,27 @@ class _GenericRpcHandler(grpc.GenericRpcHandler):
class _Server(interfaces.Server): class _Server(interfaces.Server):
def __init__(self, server): def __init__(self, grpc_server):
self._server = server self._grpc_server = grpc_server
def add_insecure_port(self, address): def add_insecure_port(self, address):
return self._server.add_insecure_port(address) return self._grpc_server.add_insecure_port(address)
def add_secure_port(self, address, server_credentials): def add_secure_port(self, address, server_credentials):
return self._server.add_secure_port(address, server_credentials) return self._grpc_server.add_secure_port(address, server_credentials)
def start(self): def start(self):
self._server.start() self._grpc_server.start()
def stop(self, grace): def stop(self, grace):
return self._server.stop(grace) return self._grpc_server.stop(grace)
def __enter__(self): def __enter__(self):
self._server.start() self._grpc_server.start()
return self return self
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
self._server.stop(None) self._grpc_server.stop(None)
return False return False

Write Preview
Loading…
Cancel
Save