Revert "Use latest bootstrap"

This reverts commit a0687c1.

.travis.yml

@@ -7,7 +7,7 @@ install:
     - cp buildout/* .
     - mkdir -p buildout-cache/eggs
     - mkdir -p buildout-cache/downloads
-    - python bootstrap.py -c travis.cfg --setuptools-version 7.0
+    - python bootstrap.py -c travis.cfg
     - bin/buildout -N -t 3 -v -c travis.cfg
 
 script: bin/coverage run bin/test -s seantis.people

buildout/bootstrap.py

@@ -35,7 +35,7 @@
 Simply run this script in a directory containing a buildout.cfg, using the
 Python that you want bin/buildout to use.
 
-Note that by using --find-links to point to local resources, you can keep
+Note that by using --find-links to point to local resources, you can keep 
 this script from going over the network.
 '''
 
@@ -59,8 +59,6 @@
 parser.add_option("--allow-site-packages",
                   action="store_true", default=False,
                   help=("Let bootstrap.py use existing site packages"))
-parser.add_option("--setuptools-version",
-                  help="use a specific setuptools version")
 
 
 options, args = parser.parse_args()
@@ -81,20 +79,16 @@
 
 if not options.allow_site_packages:
     # ez_setup imports site, which adds site packages
-    # this will remove them from the path to ensure that incompatible versions
+    # this will remove them from the path to ensure that incompatible versions 
     # of setuptools are not in the path
     import site
-    # inside a virtualenv, there is no 'getsitepackages'.
+    # inside a virtualenv, there is no 'getsitepackages'. 
     # We can't remove these reliably
     if hasattr(site, 'getsitepackages'):
         for sitepackage_path in site.getsitepackages():
             sys.path[:] = [x for x in sys.path if sitepackage_path not in x]
 
 setup_args = dict(to_dir=tmpeggs, download_delay=0)
-
-if options.setuptools_version is not None:
-    setup_args['version'] = options.setuptools_version
-
 ez['use_setuptools'](**setup_args)
 import setuptools
 import pkg_resources
@@ -134,15 +128,10 @@
     _final_parts = '*final-', '*final'
 
     def _final_version(parsed_version):
-        try:
-            return not parsed_version.is_prerelease
-        except AttributeError:
-            # Older setuptools
-            for part in parsed_version:
-                if (part[:1] == '*') and (part not in _final_parts):
-                    return False
-            return True
-
+        for part in parsed_version:
+            if (part[:1] == '*') and (part not in _final_parts):
+                return False
+        return True
     index = setuptools.package_index.PackageIndex(
         search_path=[setuptools_path])
     if find_links:
@@ -186,4 +175,4 @@ def _final_version(parsed_version):
     args[0:0] = ['-c', options.config_file]
 
 zc.buildout.buildout.main(args)
-shutil.rmtree(tmpeggs)
+shutil.rmtree(tmpeggs)