try use distribute always, update version

2011-07-09 10:09:04 +02:00 · 2011-07-09 10:09:04 +02:00 · 814c6c70f1
parent 85118e9019
commit 814c6c70f1
2 changed files with 1 additions and 3 deletions
--- a/distribute_setup.py
+++ b/distribute_setup.py
@ -46,7 +46,7 @@ except ImportError:
            args = [quote(arg) for arg in args]
        return os.spawnl(os.P_WAIT, sys.executable, *args) == 0

-DEFAULT_VERSION = "0.6.14"
+DEFAULT_VERSION = "0.6.19"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"

--- a/setup.py
+++ b/setup.py
@ -2,8 +2,6 @@ import os, sys
 try:
    from setuptools import setup
 except ImportError:
-    if sys.version_info < (3,0):
-        raise
    from distribute_setup import use_setuptools
    use_setuptools()
    from setuptools import setup