down integrate python opensource to svn
diff --git a/python/ez_setup.py b/python/ez_setup.py
index a2cf777..71177b0 100755
--- a/python/ez_setup.py
+++ b/python/ez_setup.py
@@ -103,10 +103,12 @@
sys.path.insert(0, egg)
import setuptools; setuptools.bootstrap_install_from = egg
try:
+ return do_download()
import pkg_resources
except ImportError:
return do_download()
try:
+ return do_download()
pkg_resources.require("setuptools>="+version); return
except pkg_resources.VersionConflict, e:
if was_imported: