Merge github.com:grpc/grpc into flowctlN

7 years ago · 552be178ef
parent 071c5d1309 574faf3b05
commit 552be178ef
1 changed files with 2 additions and 2 deletions
--- a/src/compiler/python_generator.cc
+++ b/src/compiler/python_generator.cc
@ -767,9 +767,9 @@ bool PythonGrpcGenerator::Generate(const FileDescriptor* file,

  ProtoBufFile pbfile(file);
  PrivateGenerator generator(config_, &pbfile);
-  if (parameter == "grpc_2_0") {
+  if (parameter == "" || parameter == "grpc_2_0") {
    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) &&
           GenerateGrpc(context, generator, pb2_file_name, false);
  } else {