Merge github.com:grpc/grpc into flowctlN

pull/11072/head
Craig Tiller 7 years ago
commit 552be178ef
  1. 4
      src/compiler/python_generator.cc

@ -767,9 +767,9 @@ bool PythonGrpcGenerator::Generate(const FileDescriptor* file,
ProtoBufFile pbfile(file); ProtoBufFile pbfile(file);
PrivateGenerator generator(config_, &pbfile); PrivateGenerator generator(config_, &pbfile);
if (parameter == "grpc_2_0") { if (parameter == "" || parameter == "grpc_2_0") {
return GenerateGrpc(context, generator, pb2_grpc_file_name, true); return GenerateGrpc(context, generator, pb2_grpc_file_name, true);
} else if (parameter == "grpc_1_0" || parameter == "") { } else if (parameter == "grpc_1_0") {
return GenerateGrpc(context, generator, pb2_grpc_file_name, true) && return GenerateGrpc(context, generator, pb2_grpc_file_name, true) &&
GenerateGrpc(context, generator, pb2_file_name, false); GenerateGrpc(context, generator, pb2_file_name, false);
} else { } else {

Loading…
Cancel
Save