[Python-checkins] distutils2: Remove mentions of abiflags (never available in 2.x)

Mon Sep 19 15:12:39 CEST 2011

http://hg.python.org/distutils2/rev/71626e848b24
changeset: 1153:71626e848b24
user: Éric Araujo <merwok at netwok.org>
date: Sun Sep 18 23:30:28 2011 +0200
summary:
 Remove mentions of abiflags (never available in 2.x)
files:
 distutils2/_backport/sysconfig.cfg | 4 ++--
 distutils2/_backport/sysconfig.py | 10 +---------
 distutils2/command/build_ext.py | 2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/distutils2/_backport/sysconfig.cfg b/distutils2/_backport/sysconfig.cfg
--- a/distutils2/_backport/sysconfig.cfg
+++ b/distutils2/_backport/sysconfig.cfg
@@ -40,8 +40,8 @@
 platstdlib = {platbase}/lib/python{py_version_short}
 purelib = {base}/lib/python{py_version_short}/site-packages
 platlib = {platbase}/lib/python{py_version_short}/site-packages
-include = {base}/include/python{py_version_short}{abiflags}
-platinclude = {platbase}/include/python{py_version_short}{abiflags}
+include = {base}/include/python{py_version_short}
+platinclude = {platbase}/include/python{py_version_short}
 data = {base}
 
 [posix_home]
diff --git a/distutils2/_backport/sysconfig.py b/distutils2/_backport/sysconfig.py
--- a/distutils2/_backport/sysconfig.py
+++ b/distutils2/_backport/sysconfig.py
@@ -316,10 +316,7 @@
 """Return the path of the Makefile."""
 if _PYTHON_BUILD:
 return os.path.join(_PROJECT_BASE, "Makefile")
- if hasattr(sys, 'abiflags'):
- config_dir_name = 'config-%s%s' % (_PY_VERSION_SHORT, sys.abiflags)
- else:
- config_dir_name = 'config'
+ config_dir_name = 'config'
 return os.path.join(get_path('stdlib'), config_dir_name, 'Makefile')
 
 
@@ -468,11 +465,6 @@
 _CONFIG_VARS['base'] = _PREFIX
 _CONFIG_VARS['platbase'] = _EXEC_PREFIX
 _CONFIG_VARS['projectbase'] = _PROJECT_BASE
- try:
- _CONFIG_VARS['abiflags'] = sys.abiflags
- except AttributeError:
- # sys.abiflags may not be defined on all platforms.
- _CONFIG_VARS['abiflags'] = ''
 
 if os.name in ('nt', 'os2'):
 _init_non_posix(_CONFIG_VARS)
diff --git a/distutils2/command/build_ext.py b/distutils2/command/build_ext.py
--- a/distutils2/command/build_ext.py
+++ b/distutils2/command/build_ext.py
@@ -650,7 +650,7 @@
 
 else:
 if sysconfig.get_config_var('Py_ENABLE_SHARED'):
- template = 'python%d.%d' + sys.abiflags
+ template = 'python%d.%d'
 pythonlib = template % sys.version_info[:2]
 return ext.libraries + [pythonlib]
 else:
-- 
Repository URL: http://hg.python.org/distutils2
