From 67c6025d9ef301113fb06834bbd6dd8a308fa688 Mon Sep 17 00:00:00 2001 From: MinRK Date: Mon, 11 Apr 2011 10:54:50 -0700 Subject: [PATCH] don't rely on setuptools for readline dependency check --- setup.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 64085e6b0..3412dab37 100755 --- a/setup.py +++ b/setup.py @@ -62,6 +62,7 @@ from setupbase import ( check_for_dependencies, record_commit_info, ) +from setupext.setupext import check_for_readline isfile = os.path.isfile pjoin = os.path.join @@ -219,10 +220,14 @@ if 'setuptools' in sys.modules: test='nose>=0.10.1', ) requires = setup_args.setdefault('install_requires', []) - if sys.platform == 'darwin': - requires.append('readline') - elif sys.platform.startswith('win'): - requires.append('pyreadline') + if not check_for_readline(): + if sys.platform == 'darwin': + requires.append('readline') + elif sys.platform.startswith('win'): + requires.append('pyreadline') + else: + pass + # do we want to install readline here? # Script to be run by the windows binary installer after the default setup # routine, to add shortcuts and similar windows-only things. Windows