From 999bbf14019ff760a6b380961fa1746c36df173c Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Wed, 15 Jul 2020 13:09:53 -0700 Subject: [PATCH] Format --- examples/python/data_transmission/client.py | 8 ++--- examples/python/data_transmission/server.py | 4 +-- .../helloworld/greeter_client_with_options.py | 10 +++--- .../default_value/greeter_client.py | 4 +-- .../interceptors/headers/greeter_client.py | 4 +-- .../interceptors/headers/greeter_server.py | 9 +++-- examples/python/metadata/metadata_client.py | 4 +-- examples/python/metadata/metadata_server.py | 4 +-- examples/python/multiplex/multiplex_client.py | 27 +++++++------- examples/python/multiplex/multiplex_server.py | 17 +++++---- .../python/multiplex/route_guide_resources.py | 5 ++- .../python/route_guide/route_guide_client.py | 22 ++++++------ .../route_guide/route_guide_resources.py | 5 ++- .../python/route_guide/route_guide_server.py | 13 ++++--- src/python/grpcio/grpc/_runtime_protos.py | 1 + .../grpcio_tests/tests/unit/BUILD.bazel | 6 ++-- tools/distrib/python/grpcio_tools/BUILD.bazel | 24 ++++++++----- .../python/grpcio_tools/grpc_tools/protoc.py | 4 +-- .../grpcio_tools/grpc_tools/test/BUILD.bazel | 36 +++++++++---------- 19 files changed, 105 insertions(+), 102 deletions(-) diff --git a/examples/python/data_transmission/client.py b/examples/python/data_transmission/client.py index 529acdcc9b8..3c138af7b2a 100644 --- a/examples/python/data_transmission/client.py +++ b/examples/python/data_transmission/client.py @@ -36,8 +36,8 @@ CLIENT_ID = 1 # only respond once.) def simple_method(stub): print("--------------Call SimpleMethod Begin--------------") - request = protos.Request( - client_id=CLIENT_ID, request_data="called by Python client") + request = protos.Request(client_id=CLIENT_ID, + request_data="called by Python client") response = stub.SimpleMethod(request) print("resp from server(%d), the message=%s" % (response.server_id, response.response_data)) @@ -70,8 +70,8 @@ def client_streaming_method(stub): # but the server can return the response many times.) def server_streaming_method(stub): print("--------------Call ServerStreamingMethod Begin--------------") - request = protos.Request( - client_id=CLIENT_ID, request_data="called by Python client") + request = protos.Request(client_id=CLIENT_ID, + request_data="called by Python client") response_iterator = stub.ServerStreamingMethod(request) for response in response_iterator: print("recv from server(%d), message=%s" % diff --git a/examples/python/data_transmission/server.py b/examples/python/data_transmission/server.py index 27982861e66..36ebbeffa5b 100644 --- a/examples/python/data_transmission/server.py +++ b/examples/python/data_transmission/server.py @@ -44,8 +44,8 @@ class DemoServer(services.GRPCDemoServicer): def ClientStreamingMethod(self, request_iterator, context): print("ClientStreamingMethod called by client...") for request in request_iterator: - print("recv from client(%d), message= %s" % (request.client_id, - request.request_data)) + print("recv from client(%d), message= %s" % + (request.client_id, request.request_data)) response = protos.Response( server_id=SERVER_ID, response_data="Python server ClientStreamingMethod ok") diff --git a/examples/python/helloworld/greeter_client_with_options.py b/examples/python/helloworld/greeter_client_with_options.py index 1252b5fe547..81476fd481d 100644 --- a/examples/python/helloworld/greeter_client_with_options.py +++ b/examples/python/helloworld/greeter_client_with_options.py @@ -27,11 +27,11 @@ def run(): # of the code. # # For more channel options, please see https://grpc.io/grpc/core/group__grpc__arg__keys.html - with grpc.insecure_channel( - target='localhost:50051', - options=[('grpc.lb_policy_name', 'pick_first'), - ('grpc.enable_retries', 0), ('grpc.keepalive_timeout_ms', - 10000)]) as channel: + with grpc.insecure_channel(target='localhost:50051', + options=[('grpc.lb_policy_name', 'pick_first'), + ('grpc.enable_retries', 0), + ('grpc.keepalive_timeout_ms', 10000) + ]) as channel: stub = services.GreeterStub(channel) # Timeout in seconds. # Please refer gRPC Python documents for more detail. https://grpc.io/grpc/python/grpc.html diff --git a/examples/python/interceptors/default_value/greeter_client.py b/examples/python/interceptors/default_value/greeter_client.py index 471c7db5726..f3ca960aeff 100644 --- a/examples/python/interceptors/default_value/greeter_client.py +++ b/examples/python/interceptors/default_value/greeter_client.py @@ -18,8 +18,8 @@ import logging import grpc -protos, services = grpc.protos_and_services( - "protos/helloworld.proto", include_paths=["../../.."]) +protos, services = grpc.protos_and_services("protos/helloworld.proto", + include_paths=["../../.."]) import default_value_client_interceptor diff --git a/examples/python/interceptors/headers/greeter_client.py b/examples/python/interceptors/headers/greeter_client.py index 2b0c14ae8c3..bfe0bdb5929 100644 --- a/examples/python/interceptors/headers/greeter_client.py +++ b/examples/python/interceptors/headers/greeter_client.py @@ -18,8 +18,8 @@ import logging import grpc -protos, services = grpc.protos_and_services( - "protos/helloworld.protos", include_paths=["../../.."]) +protos, services = grpc.protos_and_services("protos/helloworld.protos", + include_paths=["../../.."]) import header_manipulator_client_interceptor diff --git a/examples/python/interceptors/headers/greeter_server.py b/examples/python/interceptors/headers/greeter_server.py index a2c53638b7e..ca612dafd1d 100644 --- a/examples/python/interceptors/headers/greeter_server.py +++ b/examples/python/interceptors/headers/greeter_server.py @@ -18,8 +18,8 @@ import logging import grpc -protos, services = grpc.protos_and_services( - "protos/helloworld.protos", include_paths=["../../.."]) +protos, services = grpc.protos_and_services("protos/helloworld.protos", + include_paths=["../../.."]) from request_header_validator_interceptor import RequestHeaderValidatorInterceptor @@ -33,9 +33,8 @@ def serve(): header_validator = RequestHeaderValidatorInterceptor( 'one-time-password', '42', grpc.StatusCode.UNAUTHENTICATED, 'Access denied!') - server = grpc.server( - futures.ThreadPoolExecutor(max_workers=10), - interceptors=(header_validator,)) + server = grpc.server(futures.ThreadPoolExecutor(max_workers=10), + interceptors=(header_validator,)) services.add_GreeterServicer_to_server(Greeter(), server) server.add_insecure_port('[::]:50051') server.start() diff --git a/examples/python/metadata/metadata_client.py b/examples/python/metadata/metadata_client.py index 1fe3367ca5d..f1d3753f065 100644 --- a/examples/python/metadata/metadata_client.py +++ b/examples/python/metadata/metadata_client.py @@ -18,8 +18,8 @@ import logging import grpc -protos, services = grpc.protos_and_services( - "protos/helloworld.proto", include_paths=["../.."]) +protos, services = grpc.protos_and_services("protos/helloworld.proto", + include_paths=["../.."]) def run(): diff --git a/examples/python/metadata/metadata_server.py b/examples/python/metadata/metadata_server.py index 2efe2291d88..ad28f483e5b 100644 --- a/examples/python/metadata/metadata_server.py +++ b/examples/python/metadata/metadata_server.py @@ -19,8 +19,8 @@ import logging import grpc -protos, services = grpc.protos_and_services( - "protos/helloworld.proto", include_paths=["../.."]) +protos, services = grpc.protos_and_services("protos/helloworld.proto", + include_paths=["../.."]) class Greeter(services.GreeterServicer): diff --git a/examples/python/multiplex/multiplex_client.py b/examples/python/multiplex/multiplex_client.py index 26cb36af84f..690d9a85888 100644 --- a/examples/python/multiplex/multiplex_client.py +++ b/examples/python/multiplex/multiplex_client.py @@ -21,17 +21,17 @@ import logging import grpc -hw_protos, hw_services = grpc.protos_and_services( - "protos/helloworld.proto", include_paths=["../.."]) -rg_protos, rg_services = grpc.protos_and_services( - "protos/route_guide.proto", include_paths=["../.."]) +hw_protos, hw_services = grpc.protos_and_services("protos/helloworld.proto", + include_paths=["../.."]) +rg_protos, rg_services = grpc.protos_and_services("protos/route_guide.proto", + include_paths=["../.."]) import route_guide_resources def make_route_note(message, latitude, longitude): - return rg_protos.RouteNote( - message=message, - location=rg_protos.Point(latitude=latitude, longitude=longitude)) + return rg_protos.RouteNote(message=message, + location=rg_protos.Point(latitude=latitude, + longitude=longitude)) def guide_get_one_feature(route_guide_stub, point): @@ -47,17 +47,18 @@ def guide_get_one_feature(route_guide_stub, point): def guide_get_feature(route_guide_stub): - guide_get_one_feature(route_guide_stub, - rg_protos.Point( - latitude=409146138, longitude=-746188906)) + guide_get_one_feature( + route_guide_stub, + rg_protos.Point(latitude=409146138, longitude=-746188906)) guide_get_one_feature(route_guide_stub, rg_protos.Point(latitude=0, longitude=0)) def guide_list_features(route_guide_stub): - rectangle = rg_protos.Rectangle( - lo=rg_protos.Point(latitude=400000000, longitude=-750000000), - hi=rg_protos.Point(latitude=420000000, longitude=-730000000)) + rectangle = rg_protos.Rectangle(lo=rg_protos.Point(latitude=400000000, + longitude=-750000000), + hi=rg_protos.Point(latitude=420000000, + longitude=-730000000)) print("Looking for features between 40, -75 and 42, -73") features = route_guide_stub.ListFeatures(rectangle) diff --git a/examples/python/multiplex/multiplex_server.py b/examples/python/multiplex/multiplex_server.py index b62883c49ca..7a6e800dc10 100644 --- a/examples/python/multiplex/multiplex_server.py +++ b/examples/python/multiplex/multiplex_server.py @@ -20,10 +20,10 @@ import logging import grpc -hw_protos, hw_services = grpc.protos_and_services( - "protos/helloworld.proto", include_paths=["../.."]) -rg_protos, rg_services = grpc.protos_and_services( - "protos/route_guide.proto", include_paths=["../.."]) +hw_protos, hw_services = grpc.protos_and_services("protos/helloworld.proto", + include_paths=["../.."]) +rg_protos, rg_services = grpc.protos_and_services("protos/route_guide.proto", + include_paths=["../.."]) import route_guide_resources @@ -103,11 +103,10 @@ class _RouteGuideServicer(rg_services.RouteGuideServicer): prev_point = point elapsed_time = time.time() - start_time - return rg_protos.RouteSummary( - point_count=point_count, - feature_count=feature_count, - distance=int(distance), - elapsed_time=int(elapsed_time)) + return rg_protos.RouteSummary(point_count=point_count, + feature_count=feature_count, + distance=int(distance), + elapsed_time=int(elapsed_time)) def RouteChat(self, request_iterator, context): prev_notes = [] diff --git a/examples/python/multiplex/route_guide_resources.py b/examples/python/multiplex/route_guide_resources.py index bd92bc9fc12..725992c1d08 100644 --- a/examples/python/multiplex/route_guide_resources.py +++ b/examples/python/multiplex/route_guide_resources.py @@ -32,8 +32,7 @@ def read_route_guide_database(): for item in json.load(route_guide_db_file): feature = protos.Feature( name=item["name"], - location=protos.Point( - latitude=item["location"]["latitude"], - longitude=item["location"]["longitude"])) + location=protos.Point(latitude=item["location"]["latitude"], + longitude=item["location"]["longitude"])) feature_list.append(feature) return feature_list diff --git a/examples/python/route_guide/route_guide_client.py b/examples/python/route_guide/route_guide_client.py index c9cf828b8df..2c2c4d1f0a6 100644 --- a/examples/python/route_guide/route_guide_client.py +++ b/examples/python/route_guide/route_guide_client.py @@ -20,15 +20,15 @@ import logging import grpc -protos, services = grpc.protos_and_services( - "protos/route_guide.proto", include_paths=["../.."]) +protos, services = grpc.protos_and_services("protos/route_guide.proto", + include_paths=["../.."]) import route_guide_resources def make_route_note(message, latitude, longitude): - return protos.RouteNote( - message=message, - location=protos.Point(latitude=latitude, longitude=longitude)) + return protos.RouteNote(message=message, + location=protos.Point(latitude=latitude, + longitude=longitude)) def guide_get_one_feature(stub, point): @@ -44,16 +44,16 @@ def guide_get_one_feature(stub, point): def guide_get_feature(stub): - guide_get_one_feature(stub, - protos.Point( - latitude=409146138, longitude=-746188906)) + guide_get_one_feature( + stub, protos.Point(latitude=409146138, longitude=-746188906)) guide_get_one_feature(stub, protos.Point(latitude=0, longitude=0)) def guide_list_features(stub): - rectangle = protos.Rectangle( - lo=protos.Point(latitude=400000000, longitude=-750000000), - hi=protos.Point(latitude=420000000, longitude=-730000000)) + rectangle = protos.Rectangle(lo=protos.Point(latitude=400000000, + longitude=-750000000), + hi=protos.Point(latitude=420000000, + longitude=-730000000)) print("Looking for features between 40, -75 and 42, -73") features = stub.ListFeatures(rectangle) diff --git a/examples/python/route_guide/route_guide_resources.py b/examples/python/route_guide/route_guide_resources.py index 530daad79ea..e6640950adc 100644 --- a/examples/python/route_guide/route_guide_resources.py +++ b/examples/python/route_guide/route_guide_resources.py @@ -31,8 +31,7 @@ def read_route_guide_database(): for item in json.load(route_guide_db_file): feature = protos.Feature( name=item["name"], - location=protos.Point( - latitude=item["location"]["latitude"], - longitude=item["location"]["longitude"])) + location=protos.Point(latitude=item["location"]["latitude"], + longitude=item["location"]["longitude"])) feature_list.append(feature) return feature_list diff --git a/examples/python/route_guide/route_guide_server.py b/examples/python/route_guide/route_guide_server.py index 1b7f16bce74..1e8d7e3d928 100644 --- a/examples/python/route_guide/route_guide_server.py +++ b/examples/python/route_guide/route_guide_server.py @@ -20,8 +20,8 @@ import logging import grpc -protos, services = grpc.protos_and_services( - "protos/route_guide.proto", include_paths=["../.."]) +protos, services = grpc.protos_and_services("protos/route_guide.proto", + include_paths=["../.."]) import route_guide_resources @@ -96,11 +96,10 @@ class RouteGuideServicer(services.RouteGuideServicer): prev_point = point elapsed_time = time.time() - start_time - return protos.RouteSummary( - point_count=point_count, - feature_count=feature_count, - distance=int(distance), - elapsed_time=int(elapsed_time)) + return protos.RouteSummary(point_count=point_count, + feature_count=feature_count, + distance=int(distance), + elapsed_time=int(elapsed_time)) def RouteChat(self, request_iterator, context): prev_notes = [] diff --git a/src/python/grpcio/grpc/_runtime_protos.py b/src/python/grpcio/grpc/_runtime_protos.py index c9e3c9e28f3..71ac7d0a8a0 100644 --- a/src/python/grpcio/grpc/_runtime_protos.py +++ b/src/python/grpcio/grpc/_runtime_protos.py @@ -14,6 +14,7 @@ import sys + def _uninstalled_protos(*args, **kwargs): raise NotImplementedError( "Install the grpcio-tools package to use the protos function.") diff --git a/src/python/grpcio_tests/tests/unit/BUILD.bazel b/src/python/grpcio_tests/tests/unit/BUILD.bazel index f81aeebc634..e243913684b 100644 --- a/src/python/grpcio_tests/tests/unit/BUILD.bazel +++ b/src/python/grpcio_tests/tests/unit/BUILD.bazel @@ -116,15 +116,15 @@ py2and3_test( name = "_dynamic_stubs_test", size = "small", srcs = ["_dynamic_stubs_test.py"], - main = "_dynamic_stubs_test.py", - imports = ["../../"], data = [ "data/foo/bar.proto", ], + imports = ["../../"], + main = "_dynamic_stubs_test.py", deps = [ - "@six", "//src/python/grpcio/grpc:grpcio", "//src/python/grpcio_tests/tests/testing", "//tools/distrib/python/grpcio_tools:grpc_tools", + "@six", ], ) diff --git a/tools/distrib/python/grpcio_tools/BUILD.bazel b/tools/distrib/python/grpcio_tools/BUILD.bazel index 3de849c1111..c842a415c60 100644 --- a/tools/distrib/python/grpcio_tools/BUILD.bazel +++ b/tools/distrib/python/grpcio_tools/BUILD.bazel @@ -12,7 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -package(default_visibility = ["//src/python:__subpackages__", "//tools/distrib/python/grpcio_tools:__subpackages__"]) +package(default_visibility = [ + "//src/python:__subpackages__", + "//tools/distrib/python/grpcio_tools:__subpackages__", +]) load("//bazel:cython_library.bzl", "pyx_library") @@ -20,11 +23,11 @@ cc_library( name = "protoc_lib", srcs = ["grpc_tools/main.cc"], hdrs = ["grpc_tools/main.h"], + includes = ["."], deps = [ - "@com_google_protobuf//:protoc_lib", - "//src/compiler:grpc_plugin_support", + "//src/compiler:grpc_plugin_support", + "@com_google_protobuf//:protoc_lib", ], - includes = ["."], ) pyx_library( @@ -35,11 +38,14 @@ pyx_library( py_library( name = "grpc_tools", - srcs = ["grpc_tools/__init__.py", "grpc_tools/protoc.py"], - deps = [ - ":cyprotoc", - "@com_google_protobuf//:protobuf_python", - "//src/python/grpcio/grpc:grpcio", + srcs = [ + "grpc_tools/__init__.py", + "grpc_tools/protoc.py", ], srcs_version = "PY2AND3", + deps = [ + ":cyprotoc", + "//src/python/grpcio/grpc:grpcio", + "@com_google_protobuf//:protobuf_python", + ], ) diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py b/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py index 43847a8b06d..2602957147a 100644 --- a/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py +++ b/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py @@ -101,8 +101,8 @@ if sys.version_info[0] > 2: def _generated_file_to_module_name(self, filepath): components = filepath.split(os.path.sep) - return ".".join( - components[:-1] + [os.path.splitext(components[-1])[0]]) + return ".".join(components[:-1] + + [os.path.splitext(components[-1])[0]]) def exec_module(self, module): assert module.__name__ == self._module_name diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/test/BUILD.bazel b/tools/distrib/python/grpcio_tools/grpc_tools/test/BUILD.bazel index 96090f4d0ff..14147e66605 100644 --- a/tools/distrib/python/grpcio_tools/grpc_tools/test/BUILD.bazel +++ b/tools/distrib/python/grpcio_tools/grpc_tools/test/BUILD.bazel @@ -4,38 +4,38 @@ load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") proto_library( name = "simplest_proto", + testonly = True, srcs = ["simplest.proto"], strip_import_prefix = "/tools/distrib/python/grpcio_tools/", - testonly = True, ) proto_library( name = "complicated_proto", + testonly = True, srcs = ["complicated.proto"], - deps = [":simplest_proto"], strip_import_prefix = "/tools/distrib/python/grpcio_tools/", - testonly = True, + deps = [":simplest_proto"], ) py_proto_library( name = "complicated_py_pb2", - deps = ["complicated_proto"], testonly = True, + deps = ["complicated_proto"], ) py_test( - name = "protoc_test", - srcs = ["protoc_test.py"], - deps = [ - "//tools/distrib/python/grpcio_tools:grpc_tools", - ":complicated_py_pb2", - ], - data = [ - "simple.proto", - "simpler.proto", - "simplest.proto", - "complicated.proto", - "flawed.proto", - ], - python_version = "PY3", + name = "protoc_test", + srcs = ["protoc_test.py"], + data = [ + "complicated.proto", + "flawed.proto", + "simple.proto", + "simpler.proto", + "simplest.proto", + ], + python_version = "PY3", + deps = [ + ":complicated_py_pb2", + "//tools/distrib/python/grpcio_tools:grpc_tools", + ], )