diff options
| author |  Harsh Vardhan <harshvd95@gmail.com> | 2017-03-14 22:56:31 +0530 |
|---|---|---|
| committer | Harsh Vardhan <harshvd95@gmail.com> | 2017-03-28 21:01:51 +0530 |
| commit | abf9ce25d9549d33c9869cf45ab4becb29c1cb74 (patch) | |
| tree | 10498a316c012f39ca47bf5eba49d37071005cb4 /src/compiler/python_generator.cc | |
| parent | 974f3d797a9220d8cc1792b1a8249cfe5ac75b8f (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/compiler/python_generator.cc')
| -rw-r--r-- | src/compiler/python_generator.cc | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/compiler/python_generator.cc b/src/compiler/python_generator.cc index 7720a40352..2649c1688d 100644 --- a/src/compiler/python_generator.cc +++ b/src/compiler/python_generator.cc @@ -221,13 +221,13 @@ bool PrivateGenerator::PrintBetaServerFactory( grpc::string input_message_module_and_class; if (!method->get_module_and_message_path_input( &input_message_module_and_class, generator_file_name, - generate_in_pb2_grpc)) { + generate_in_pb2_grpc, config.import_prefix)) { return false; } grpc::string output_message_module_and_class; if (!method->get_module_and_message_path_output( &output_message_module_and_class, generator_file_name, - generate_in_pb2_grpc)) { + generate_in_pb2_grpc, config.import_prefix)) { return false; } method_implementation_constructors.insert( @@ -327,13 +327,13 @@ bool PrivateGenerator::PrintBetaStubFactory( grpc::string input_message_module_and_class; if (!method->get_module_and_message_path_input( &input_message_module_and_class, generator_file_name, - generate_in_pb2_grpc)) { + generate_in_pb2_grpc, config.import_prefix)) { return false; } grpc::string output_message_module_and_class; if (!method->get_module_and_message_path_output( &output_message_module_and_class, generator_file_name, - generate_in_pb2_grpc)) { + generate_in_pb2_grpc, config.import_prefix)) { return false; } method_cardinalities.insert( @@ -432,13 +432,13 @@ bool PrivateGenerator::PrintStub( grpc::string request_module_and_class; if (!method->get_module_and_message_path_input( &request_module_and_class, generator_file_name, - generate_in_pb2_grpc)) { + generate_in_pb2_grpc, config.import_prefix)) { return false; } grpc::string response_module_and_class; if (!method->get_module_and_message_path_output( &response_module_and_class, generator_file_name, - generate_in_pb2_grpc)) { + generate_in_pb2_grpc, config.import_prefix)) { return false; } StringMap method_dict; @@ -523,13 +523,13 @@ bool PrivateGenerator::PrintAddServicerToServer( grpc::string request_module_and_class; if (!method->get_module_and_message_path_input( &request_module_and_class, generator_file_name, - generate_in_pb2_grpc)) { + generate_in_pb2_grpc, config.import_prefix)) { return false; } grpc::string response_module_and_class; if (!method->get_module_and_message_path_output( &response_module_and_class, generator_file_name, - generate_in_pb2_grpc)) { + generate_in_pb2_grpc, config.import_prefix)) { return false; } StringMap method_dict; @@ -595,14 +595,18 @@ bool PrivateGenerator::PrintPreamble(grpc_generator::Printer* out) { auto method = service.get()->method(j); grpc::string input_type_file_name = method->get_input_type_name(); - grpc::string input_module_name = ModuleName(input_type_file_name); - grpc::string input_module_alias = ModuleAlias(input_type_file_name); + grpc::string input_module_name = + ModuleName(input_type_file_name, config.import_prefix); + grpc::string input_module_alias = + ModuleAlias(input_type_file_name, config.import_prefix); imports_set.insert( std::make_tuple(input_module_name, input_module_alias)); grpc::string output_type_file_name = method->get_output_type_name(); - grpc::string output_module_name = ModuleName(output_type_file_name); - grpc::string output_module_alias = ModuleAlias(output_type_file_name); + grpc::string output_module_name = + ModuleName(output_type_file_name, config.import_prefix); + grpc::string output_module_alias = + ModuleAlias(output_type_file_name, config.import_prefix); imports_set.insert( std::make_tuple(output_module_name, output_module_alias)); } |