Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1268)

Issues Search
    My Issues | Starred     Open | Closed | All

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: fix compile error 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
« third_party/protobuf/README.chromium ('K') | « third_party/protobuf/python/README.md ('k') | third_party/protobuf/python/google/protobuf/__init__.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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__)
« third_party/protobuf/README.chromium ('K') | « third_party/protobuf/python/README.md ('k') | third_party/protobuf/python/google/protobuf/__init__.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698