third_party/protobuf/python/google/__init__.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/init.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

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

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

index de40ea7ca058e07a399acf61529d418c07eeee61..55856141229970da017c2ddd56711e7268739fdd 100755

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

+++ b/third_party/protobuf/python/google/__init__.py

@@ -1 +1,4 @@

-__import__('pkg_resources').declare_namespace(__name__)

+try:

+ __import__('pkg_resources').declare_namespace(__name__)

+except ImportError:

+ __path__ = __import__('pkgutil').extend_path(__path__, __name__)

« no previous file with comments | « third_party/protobuf/python/README.md ('k') | third_party/protobuf/python/google/protobuf/__init__.py » ('j') | no next file with comments »

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

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