aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2011-03-12 06:49:03 -0800
committerToshio Kuratomi <toshio@fedoraproject.org>2011-03-12 06:49:03 -0800
commitc8e04e093a418473f9fa49a2580e83c68fcf6c9b (patch)
tree038a03906871e641f16220f16f8df4a10beee26e
parente78f5a1f0ab26979bbd4167b7db86e8579ce3c1e (diff)
downloadexternal_python_setuptools-c8e04e093a418473f9fa49a2580e83c68fcf6c9b.tar.gz
external_python_setuptools-c8e04e093a418473f9fa49a2580e83c68fcf6c9b.tar.bz2
external_python_setuptools-c8e04e093a418473f9fa49a2580e83c68fcf6c9b.zip
Use different version of py3.2 fix from Vinay Sajip0.6.15
--HG-- branch : distribute extra : rebase_source : 9eea7c29a6f7e961ca6a39decdc2e52c828e8464
-rwxr-xr-xsetuptools/command/easy_install.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 1a0ee561..20355341 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -202,14 +202,10 @@ class easy_install(Command):
'prefix': prefix,
'sys_exec_prefix': exec_prefix,
'exec_prefix': exec_prefix,
+ # Only python 3.2+ has abiflags
+ 'abiflags': getattr(sys, 'abiflags', ''),
}
- try:
- self.config_vars['abiflags'] = sys.abiflags
- except AttributeError:
- # Only python-3.2+ has sys.abiflags
- self.config_vars['abiflags'] = ''
-
if HAS_USER_SITE:
self.config_vars['userbase'] = self.install_userbase
self.config_vars['usersite'] = self.install_usersite