diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-19 12:32:01 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-09-19 12:32:01 -0700 |
| commit | 552be178ef7ba4f71728e144594ded66a94b4cd5 (patch) | |
| tree | 02be12a0d097fc85eab5b16b900af0914ee05ce7 | |
| parent | 071c5d1309758c044dc5a8864e699889a3a8f716 (diff) | |
| parent | 574faf3b0523deec4815aac426843fa0a0fd787b (diff) | |
Merge github.com:grpc/grpc into flowctlN
| -rw-r--r-- | src/compiler/python_generator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/python_generator.cc b/src/compiler/python_generator.cc index a60b528e3b..ef2d90de9e 100644 --- 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 { |