diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:34:59 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:34:59 -0700 |
| commit | cf14183bcd5485b4a71541599ddce0b35eb71352 (patch) | |
| tree | 12f6e5eb731d7a70cdac4cdafc8b3131629413e2 /python/google/protobuf/descriptor_pool.py | |
| parent | f00300d7f04f1c38a7d70e271f9232b94dd0e326 (diff) | |
Down integrate from Google internal.
Diffstat (limited to 'python/google/protobuf/descriptor_pool.py')
| -rw-r--r-- | python/google/protobuf/descriptor_pool.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/python/google/protobuf/descriptor_pool.py b/python/google/protobuf/descriptor_pool.py index 3e80795c..20a33701 100644 --- a/python/google/protobuf/descriptor_pool.py +++ b/python/google/protobuf/descriptor_pool.py @@ -319,6 +319,7 @@ class DescriptorPool(object): if file_proto.name not in self._file_descriptors: built_deps = list(self._GetDeps(file_proto.dependency)) direct_deps = [self.FindFileByName(n) for n in file_proto.dependency] + public_deps = [direct_deps[i] for i in file_proto.public_dependency] file_descriptor = descriptor.FileDescriptor( pool=self, @@ -327,7 +328,8 @@ class DescriptorPool(object): syntax=file_proto.syntax, options=file_proto.options, serialized_pb=file_proto.SerializeToString(), - dependencies=direct_deps) + dependencies=direct_deps, + public_dependencies=public_deps) if _USE_C_DESCRIPTORS: # When using C++ descriptors, all objects defined in the file were added # to the C++ database when the FileDescriptor was built above. |