diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-12 11:13:15 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-12 11:13:15 -0800 |
commit | f473bb9903370cc9324b0881873e0d0861f5d325 (patch) | |
tree | 6b7dd647b6758371470db0c5f3f951b1c1a2ddca /src/google/protobuf/compiler/python | |
parent | 001e82a7e0c823581125c8b5299a10b5147a261b (diff) | |
parent | 2e9f5e3bac9f6c0db0a285a429546db866b90051 (diff) | |
download | protobuf-f473bb9903370cc9324b0881873e0d0861f5d325.tar.gz protobuf-f473bb9903370cc9324b0881873e0d0861f5d325.tar.bz2 protobuf-f473bb9903370cc9324b0881873e0d0861f5d325.zip |
Merge pull request #128 from krishnanm86/master
Source code refactoring. Extracted common functionality in cpp_helpers.c...
Diffstat (limited to 'src/google/protobuf/compiler/python')
-rw-r--r-- | src/google/protobuf/compiler/python/python_generator.cc | 27 | ||||
-rw-r--r-- | src/google/protobuf/compiler/python/python_generator.h | 1 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/google/protobuf/compiler/python/python_generator.cc b/src/google/protobuf/compiler/python/python_generator.cc index e6faf7ef..b30d1972 100644 --- a/src/google/protobuf/compiler/python/python_generator.cc +++ b/src/google/protobuf/compiler/python/python_generator.cc @@ -580,19 +580,24 @@ void Generator::PrintServiceDescriptor( printer_->Print("])\n\n"); } -void Generator::PrintServiceClass(const ServiceDescriptor& descriptor) const { - // Print the service. - printer_->Print("$class_name$ = service_reflection.GeneratedServiceType(" - "'$class_name$', (_service.Service,), dict(\n", - "class_name", descriptor.name()); - printer_->Indent(); + +void Generator::PrintDescriptorKeyAndModuleName(const ServiceDescriptor& descriptor) const { printer_->Print( "$descriptor_key$ = $descriptor_name$,\n", "descriptor_key", kDescriptorKey, "descriptor_name", ModuleLevelServiceDescriptorName(descriptor)); printer_->Print( "__module__ = '$module_name$'\n", - "module_name", ModuleName(file_->name())); + "module_name", ModuleName(file_->name())); +} + +void Generator::PrintServiceClass(const ServiceDescriptor& descriptor) const { + // Print the service. + printer_->Print("$class_name$ = service_reflection.GeneratedServiceType(" + "'$class_name$', (_service.Service,), dict(\n", + "class_name", descriptor.name()); + printer_->Indent(); + Generator::PrintDescriptorKeyAndModuleName(descriptor); printer_->Print("))\n\n"); printer_->Outdent(); } @@ -604,13 +609,7 @@ void Generator::PrintServiceStub(const ServiceDescriptor& descriptor) const { "'$class_name$_Stub', ($class_name$,), dict(\n", "class_name", descriptor.name()); printer_->Indent(); - printer_->Print( - "$descriptor_key$ = $descriptor_name$,\n", - "descriptor_key", kDescriptorKey, - "descriptor_name", ModuleLevelServiceDescriptorName(descriptor)); - printer_->Print( - "__module__ = '$module_name$'\n", - "module_name", ModuleName(file_->name())); + Generator::PrintDescriptorKeyAndModuleName(descriptor); printer_->Print("))\n\n"); printer_->Outdent(); } diff --git a/src/google/protobuf/compiler/python/python_generator.h b/src/google/protobuf/compiler/python/python_generator.h index 7e8f58e5..ee68ad72 100644 --- a/src/google/protobuf/compiler/python/python_generator.h +++ b/src/google/protobuf/compiler/python/python_generator.h @@ -127,6 +127,7 @@ class LIBPROTOC_EXPORT Generator : public CodeGenerator { void PrintServiceDescriptor(const ServiceDescriptor& descriptor) const; void PrintServiceClass(const ServiceDescriptor& descriptor) const; void PrintServiceStub(const ServiceDescriptor& descriptor) const; + void PrintDescriptorKeyAndModuleName(const ServiceDescriptor& descriptor) const ; void PrintEnumValueDescriptor(const EnumValueDescriptor& descriptor) const; string OptionsValue(const string& class_name, |