third_party/protobuf26/descriptor_pool.py - Issue 1162993005: Renamed google.protobuf to protobuf26

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/protobuf26/descriptor_pool.py

Issue 1162993005: Renamed google.protobuf to protobuf26 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Addressed comments Created 5 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:

Index: third_party/protobuf26/descriptor_pool.py

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

similarity index 99%

rename from third_party/google/protobuf/descriptor_pool.py

rename to third_party/protobuf26/descriptor_pool.py

index 372f458f551e2ffb20eecb795a80cbfc93066264..882fd9f2caef6b1390c8133dfb078b5409910d2a 100644

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

+++ b/third_party/protobuf26/descriptor_pool.py

@@ -59,9 +59,9 @@ __author__ = 'matthewtoia@google.com (Matt Toia)'

import sys

-from google.protobuf import descriptor

-from google.protobuf import descriptor_database

-from google.protobuf import text_encoding

+from protobuf26 import descriptor

+from protobuf26 import descriptor_database

+from protobuf26 import text_encoding

def _NormalizeFullyQualifiedName(name):