[Checkins] SVN: zope.cachedescriptors/trunk/bootstrap.py using recent bootstrap.py

[Christian Zagrodnick]

Log message for revision 79711:
  using recent bootstrap.py

Changed:
  U   zope.cachedescriptors/trunk/bootstrap.py

-=-
Modified: zope.cachedescriptors/trunk/bootstrap.py
===================================================================
--- zope.cachedescriptors/trunk/bootstrap.py	2007-09-17 10:41:22 UTC (rev 79710)
+++ zope.cachedescriptors/trunk/bootstrap.py	2007-09-17 10:48:21 UTC (rev 79711)
@@ -17,19 +17,22 @@
 The script accepts buildout command-line options, so you can
 use the -c option to specify an alternate configuration file.
 
-$Id: bootstrap.py 72703 2007-02-20 11:49:26Z jim $
+$Id$
 """
 
 import os, shutil, sys, tempfile, urllib2
 
 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':