diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2015-02-17 18:23:41 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2015-02-17 18:23:41 -0800 |
| commit | cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9 (patch) | |
| tree | e7e5dd284e2384dfaf1f8eff0eb2f3feab944872 /src/google/protobuf/compiler/python | |
| parent | f473bb9903370cc9324b0881873e0d0861f5d325 (diff) | |
| download | protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.tar.gz protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.tar.bz2 protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.zip | |
Integrate changes from Google open-source branch.
Diffstat (limited to 'src/google/protobuf/compiler/python')
| -rw-r--r-- | src/google/protobuf/compiler/python/python_generator.cc | 5 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/python/python_generator.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/python/python_generator.cc b/src/google/protobuf/compiler/python/python_generator.cc index b30d1972..0c65b993 100644 --- a/src/google/protobuf/compiler/python/python_generator.cc +++ b/src/google/protobuf/compiler/python/python_generator.cc @@ -581,14 +581,15 @@ void Generator::PrintServiceDescriptor( } -void Generator::PrintDescriptorKeyAndModuleName(const ServiceDescriptor& descriptor) const { +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 { diff --git a/src/google/protobuf/compiler/python/python_generator.h b/src/google/protobuf/compiler/python/python_generator.h index ee68ad72..2ddac601 100644 --- a/src/google/protobuf/compiler/python/python_generator.h +++ b/src/google/protobuf/compiler/python/python_generator.h @@ -127,7 +127,8 @@ 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 PrintDescriptorKeyAndModuleName( + const ServiceDescriptor& descriptor) const ; void PrintEnumValueDescriptor(const EnumValueDescriptor& descriptor) const; string OptionsValue(const string& class_name, |