[Erp5-report] r37922 luke - /erp5/trunk/buildout/bootstrap/bootstrap.py

[nobody at svn.erp5.org]

Author: luke
Date: Fri Aug 20 09:52:20 2010
New Revision: 37922

URL: http://svn.erp5.org?rev=37922&view=rev
Log:
 - update to 115416

Modified:
    erp5/trunk/buildout/bootstrap/bootstrap.py

Modified: erp5/trunk/buildout/bootstrap/bootstrap.py
URL: http://svn.erp5.org/erp5/trunk/buildout/bootstrap/bootstrap.py?rev=37922&r1=37921&r2=37922&view=diff
==============================================================================
--- erp5/trunk/buildout/bootstrap/bootstrap.py [utf8] (original)
+++ erp5/trunk/buildout/bootstrap/bootstrap.py [utf8] Fri Aug 20 09:52:20 2010
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -16,8 +16,6 @@
 Simply run this script in a directory containing a buildout.cfg.
 The script accepts buildout command-line options, so you can
 use the -c option to specify an alternate configuration file.
-
-$Id$
 """
 
 import os, shutil, sys, tempfile, urllib2
@@ -53,11 +51,10 @@ else:
 USE_DISTRIBUTE = options.distribute
 args = args + ['bootstrap']
 
-to_reload = False
 try:
     import pkg_resources
+    import setuptools
     if not hasattr(pkg_resources, '_distribute'):
-        to_reload = True
         raise ImportError
 except ImportError:
     ez = {}
@@ -70,10 +67,8 @@ except ImportError:
                              ).read() in ez
         ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
 
-    if to_reload:
-        reload(pkg_resources)
-    else:
-        import pkg_resources
+    reload(sys.modules['pkg_resources'])
+    import pkg_resources
 
 if sys.platform == 'win32':
     def quote(c):