From 814c6c70f12b98163041b6d97d0225810088b34c Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sat, 9 Jul 2011 10:09:04 +0200 Subject: [PATCH] try use distribute always, update version --- distribute_setup.py | 2 +- setup.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/distribute_setup.py b/distribute_setup.py index 3ea2e667f..bbb6f3c25 100644 --- 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" diff --git a/setup.py b/setup.py index 5ea5973ad..6aad48ff2 100644 --- 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