third_party/protobuf/python/ez_setup.py - Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll).

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/ez_setup.py

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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/ez_setup.py

diff --git a/third_party/protobuf/python/ez_setup.py b/third_party/protobuf/python/ez_setup.py

index 3aec98e48083f174bf60aafb36b9a49c48a14699..a2cf777dbaf4f12a15075c0fd2c484ad09a641c7 100755

--- a/third_party/protobuf/python/ez_setup.py

+++ b/third_party/protobuf/python/ez_setup.py

@@ -107,7 +107,6 @@ def use_setuptools(

except ImportError:

return do_download()

try:

- return do_download()

pkg_resources.require("setuptools>="+version); return

except pkg_resources.VersionConflict, e:

if was_imported:

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