[Checkins] SVN: z3c.testing/trunk/bootstrap.py update bootstrap.py

Bernd Dorn bernd.dorn at lovelysystems.com
Tue Dec 11 08:32:13 EST 2007


Log message for revision 82252:
  update bootstrap.py

Changed:
  U   z3c.testing/trunk/bootstrap.py

-=-
Modified: z3c.testing/trunk/bootstrap.py
===================================================================
--- z3c.testing/trunk/bootstrap.py	2007-12-11 00:14:02 UTC (rev 82251)
+++ z3c.testing/trunk/bootstrap.py	2007-12-11 13:32:12 UTC (rev 82252)
@@ -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':
@@ -50,3 +53,4 @@
 import zc.buildout.buildout
 zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
 shutil.rmtree(tmpeggs)
+



More information about the Checkins mailing list