third_party/protobuf/python/google/protobuf/descriptor_pool.py - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/python/google/protobuf/descriptor_pool.py

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/python/google/protobuf/descriptor_pb2.py ('k') | third_party/protobuf/python/google/protobuf/internal/api_implementation.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/python/google/protobuf/descriptor_pool.py

diff --git a/third_party/protobuf/python/google/protobuf/descriptor_pool.py b/third_party/protobuf/python/google/protobuf/descriptor_pool.py

index 3e80795c861f3d3abeba4d52d4967ea1c302ee03..20a33701720ee1ed4102a5b8d9906e792f9915cf 100644

--- a/third_party/protobuf/python/google/protobuf/descriptor_pool.py

+++ b/third_party/protobuf/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.