From 4a1174811c2a8636e48354c753dcbfbfeb9034ef Mon Sep 17 00:00:00 2001 From: utahta Date: Mon, 30 May 2011 03:08:34 +0900 Subject: [PATCH] bug fix --- pythonbrew/installer/pythoninstaller.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pythonbrew/installer/pythoninstaller.py b/pythonbrew/installer/pythoninstaller.py index 628f6a1..afbf95e 100644 --- a/pythonbrew/installer/pythoninstaller.py +++ b/pythonbrew/installer/pythoninstaller.py @@ -152,10 +152,6 @@ class PythonInstaller(object): if options.no_setuptools: logger.info("Skip installation setuptools.") return - if re.match("^Python-3.*", pkgname): - is_python3 = True - else: - is_python3 = False download_url = DISTRIBUTE_SETUP_DLSITE filename = Link(download_url).filename download_file = os.path.join(PATH_DISTS, filename) @@ -171,7 +167,7 @@ class PythonInstaller(object): s.check_call("%s %s" % (path_python, filename)) # Using easy_install install pip easy_install = os.path.join(install_dir, 'bin', 'easy_install') - if os.path.isfile(easy_install) and not is_python3: + if os.path.isfile(easy_install): logger.info("Installing pip into %s" % install_dir) s.check_call("%s pip" % (easy_install)) except: @@ -197,6 +193,8 @@ class PythonInstallerMacOSX(PythonInstaller): self.configure_options = '--with-universal-archs="intel" --enable-universalsdk=/ MACOSX_DEPLOYMENT_TARGET=10.6' elif is_python27(version): self.configure_options = '--with-universal-archs="intel" --enable-universalsdk=/ MACOSX_DEPLOYMENT_TARGET=10.6' + else: + self.configure_options = '--with-universal-archs="intel" --enable-universalsdk=/ MACOSX_DEPLOYMENT_TARGET=10.6' def patch(self): version = self.pkg.version