[Checkins] SVN: zc.buildout/trunk/bootstrap/bootstrap.py Fixed: Bug #96892.

[Jim Fulton]

Log message for revision 75593:
  Fixed: Bug #96892.
  
  Now use  system setuptools  if it is  available.  This can  also speed
  bootstrapping,  since we  don't need  to download  setuptools  in more
  cases.
  

Changed:
  U   zc.buildout/trunk/bootstrap/bootstrap.py

-=-
Modified: zc.buildout/trunk/bootstrap/bootstrap.py
===================================================================
--- zc.buildout/trunk/bootstrap/bootstrap.py	2007-05-06 20:44:19 UTC (rev 75592)
+++ zc.buildout/trunk/bootstrap/bootstrap.py	2007-05-06 21:11:27 UTC (rev 75593)
@@ -24,12 +24,15 @@
 
 tmpeggs = tempfile.mkdtemp()
 
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
-                     ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+try:
+    import pkg_resources
+except ImportError:
+    ez = {}
+    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+                         ).read() in ez
+    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
 
-import pkg_resources
+    import pkg_resources
 
 cmd = 'from setuptools.command.easy_install import main; main()'
 if sys.platform == 'win32':