d'oh - meant for branch, but I guess the temptation was there ;-)

git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@102545 62d5b8a3-27da-0310-9561-8e5933582275

bootstrap/bootstrap.py

@@ -26,21 +26,15 @@ tmpeggs = tempfile.mkdtemp()
 
 is_jython = sys.platform.startswith('java')
 
-to_reload = False
 try:
     import pkg_resources
-    if not hasattr(pkg_resources, '_distribute'):
-        to_reload = True
-        raise ImportError
 except ImportError:
     ez = {}
-    exec urllib2.urlopen('http://nightly.ziade.org/bootstraping.py'
+    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
                          ).read() in ez
     ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
-    if to_reload:
-        reload(pkg_resources)
-    else:
-        import pkg_resources
+
+    import pkg_resources
 
 if sys.platform == 'win32':
     def quote(c):
@@ -69,7 +63,7 @@ if is_jython:
            quote(tmpeggs), 'zc.buildout' + VERSION],
            env=dict(os.environ,
                PYTHONPATH=
-               ws.find(pkg_resources.Requirement.parse('distribute')).location
+               ws.find(pkg_resources.Requirement.parse('setuptools')).location
                ),
            ).wait() == 0
 
@@ -79,7 +73,7 @@ else:
         '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
         dict(os.environ,
             PYTHONPATH=
-            ws.find(pkg_resources.Requirement.parse('distribute')).location
+            ws.find(pkg_resources.Requirement.parse('setuptools')).location
             ),
         ) == 0
 

dev.py

@@ -30,22 +30,15 @@ for d in 'eggs', 'develop-eggs', 'bin':
 if os.path.isdir('build'):
     shutil.rmtree('build')
 
-to_reload = False
 try:
     import pkg_resources
-    if not hasattr(pkg_resources, '_distribute'):
-        to_reload = True
-        raise ImportError
 except ImportError:
     ez = {}
-    exec urllib2.urlopen('http://nightly.ziade.org/bootstraping.py'
+    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
                          ).read() in ez
-    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
-    if to_reload:
-        reload(pkg_resources)
-    else:
-        import pkg_resources
+    ez['use_setuptools'](to_dir='eggs', download_delay=0)
 
+    import pkg_resources
 
 subprocess.Popen(
     [sys.executable] +

setup.py

@@ -72,7 +72,7 @@ setup(
     packages = ['zc', 'zc.buildout'],
     package_dir = {'': 'src'},
     namespace_packages = ['zc'],
-    install_requires = 'distribute',
+    install_requires = 'setuptools',
     include_package_data = True,
     entry_points = {'console_scripts':
                     ['buildout = %s.buildout:main' % name]}, 

zc.recipe.egg_/setup.py

@@ -67,7 +67,7 @@ setup(
     namespace_packages = ['zc', 'zc.recipe'],
     install_requires = [
         'zc.buildout >=1.2.0',
-        'distribute'],
+        'setuptools'],
     tests_require = ['zope.testing'],
     test_suite = name+'.tests.test_suite',
     entry_points = {'zc.buildout': ['default = %s:Scripts' % name,