aboutsummaryrefslogtreecommitdiff
path: root/python/ez_setup.py
diff options
context:
space:
mode:
authorjieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2014-08-12 21:28:31 +0000
committerjieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2014-08-12 21:28:31 +0000
commit7580a8929f9505bd52125d523729da4b1672a493 (patch)
tree83951ed14a4f5ca695e52d8a157d6f1de26ecbff /python/ez_setup.py
parentbde4a3254a7de58911941b0fbf38e9dd992de973 (diff)
downloadprotobuf-7580a8929f9505bd52125d523729da4b1672a493.tar.gz
protobuf-7580a8929f9505bd52125d523729da4b1672a493.tar.bz2
protobuf-7580a8929f9505bd52125d523729da4b1672a493.zip
add shared_pr.h
Diffstat (limited to 'python/ez_setup.py')
-rwxr-xr-xpython/ez_setup.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/python/ez_setup.py b/python/ez_setup.py
index 71177b00..3aec98e4 100755
--- a/python/ez_setup.py
+++ b/python/ez_setup.py
@@ -103,7 +103,6 @@ def use_setuptools(
sys.path.insert(0, egg)
import setuptools; setuptools.bootstrap_install_from = egg
try:
- return do_download()
import pkg_resources
except ImportError:
return do_download()