commit 71448b2898221cfeeeb1f64da8907e7ca6a29a75
author Masood Malekghassemi <atash@google.com> Wed Jun 29 11:41:24 2016 -0700
committer Masood Malekghassemi <atash@google.com> Wed Jun 29 11:41:24 2016 -0700
tree 4d87f838ac74d8f5db9e34373902e0b7ad67b1e5
parent 94f0a50d1ea3208a0602f6eb67b6438bdb957387

Use open-source defaults to propagate Python plugin configuration

src/compiler/python_generator.cc

diff --git a/src/compiler/python_generator.cc b/src/compiler/python_generator.cc
index 15cda47..c5f1ed8 100644
--- a/src/compiler/python_generator.cc
+++ b/src/compiler/python_generator.cc
@@ -66,6 +66,9 @@
 
 namespace grpc_python_generator {
 
+GeneratorConfiguration::GeneratorConfiguration()
+    : grpc_package_root("grpc"), beta_package_root("grpc.beta") {}
+
 PythonGrpcGenerator::PythonGrpcGenerator(const GeneratorConfiguration& config)
     : config_(config) {}
 

src/compiler/python_generator.h

diff --git a/src/compiler/python_generator.h b/src/compiler/python_generator.h
index fc51b48..7ed99ef 100644
--- a/src/compiler/python_generator.h
+++ b/src/compiler/python_generator.h
@@ -43,6 +43,7 @@
 // Data pertaining to configuration of the generator with respect to anything
 // that may be used internally at Google.
 struct GeneratorConfiguration {
+  GeneratorConfiguration();
   grpc::string grpc_package_root;
   grpc::string beta_package_root;
 };

src/compiler/python_plugin.cc

diff --git a/src/compiler/python_plugin.cc b/src/compiler/python_plugin.cc
index fc76ee5..3457aa6 100644
--- a/src/compiler/python_plugin.cc
+++ b/src/compiler/python_plugin.cc
@@ -38,8 +38,6 @@
 
 int main(int argc, char* argv[]) {
   grpc_python_generator::GeneratorConfiguration config;
-  config.grpc_package_root = "grpc";
-  config.beta_package_root = "grpc.beta";
   grpc_python_generator::PythonGrpcGenerator generator(config);
   return grpc::protobuf::compiler::PluginMain(argc, argv, &generator);
 }

tools/distrib/python/grpcio_tools/grpc/tools/main.cc

diff --git a/tools/distrib/python/grpcio_tools/grpc/tools/main.cc b/tools/distrib/python/grpcio_tools/grpc/tools/main.cc
index 81675b4..8391839 100644
--- a/tools/distrib/python/grpcio_tools/grpc/tools/main.cc
+++ b/tools/distrib/python/grpcio_tools/grpc/tools/main.cc
@@ -45,7 +45,6 @@
 
   // gRPC Python
   grpc_python_generator::GeneratorConfiguration grpc_py_config;
-  grpc_py_config.beta_package_root = "grpc.beta";
   grpc_python_generator::PythonGrpcGenerator grpc_py_generator(grpc_py_config);
   cli.RegisterGenerator("--grpc_python_out", &grpc_py_generator,
                         "Generate Python source file.");