mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

remove various dead version checks (closes #22349)

Browse source 
Patch from Thomas Kluyver.
This commit is contained in:
Benjamin Peterson 2014-09-06 17:24:12 -04:00
parent 8f0a1d0f28
commit df0eb95b57
3 changed files with 16 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/distutils/command/build_ext.py
View file

@ -14,13 +14,7 @@ from distutils.extension import Extension
from distutils.util import get_platform from distutils.util import get_platform
from distutils import log from distutils import log
# this keeps compatibility from 2.3 to 2.5 from site import USER_BASE
if sys.version < "2.6":
USER_BASE = None
HAS_USER_SITE = False
else:
from site import USER_BASE
HAS_USER_SITE = True
if os.name == 'nt': if os.name == 'nt':
from distutils.msvccompiler import get_build_version from distutils.msvccompiler import get_build_version
@ -97,14 +91,11 @@ class build_ext(Command):
"list of SWIG command line options"), "list of SWIG command line options"),
('swig=', None, ('swig=', None,
"path to the SWIG executable"), "path to the SWIG executable"),
('user', None,
"add user include, library and rpath")
] ]
boolean_options = ['inplace', 'debug', 'force', 'swig-cpp'] boolean_options = ['inplace', 'debug', 'force', 'swig-cpp', 'user']
if HAS_USER_SITE:
user_options.append(('user', None,
"add user include, library and rpath"))
boolean_options.append('user')
help_options = [ help_options = [
('help-compiler', None, ('help-compiler', None,

24
Lib/distutils/sysconfig.py
View file

@ -151,10 +151,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
if standard_lib: if standard_lib:
return os.path.join(prefix, "Lib") return os.path.join(prefix, "Lib")
else: else:
if get_python_version() < "2.2": return os.path.join(prefix, "Lib", "site-packages")
return prefix
else:
return os.path.join(prefix, "Lib", "site-packages")
else: else:
raise DistutilsPlatformError( raise DistutilsPlatformError(
"I don't know where Python installs its library " "I don't know where Python installs its library "
@ -244,12 +241,8 @@ def get_config_h_filename():
inc_dir = _sys_home or project_base inc_dir = _sys_home or project_base
else: else:
inc_dir = get_python_inc(plat_specific=1) inc_dir = get_python_inc(plat_specific=1)
if get_python_version() < '2.2':
config_h = 'config.h' return os.path.join(inc_dir, 'pyconfig.h')
else:
# The name of the config.h file changed in 2.2
config_h = 'pyconfig.h'
return os.path.join(inc_dir, config_h)
def get_makefile_filename(): def get_makefile_filename():
@ -461,17 +454,6 @@ def _init_posix():
if python_build: if python_build:
g['LDSHARED'] = g['BLDSHARED'] g['LDSHARED'] = g['BLDSHARED']
elif get_python_version() < '2.1':
# The following two branches are for 1.5.2 compatibility.
if sys.platform == 'aix4': # what about AIX 3.x ?
# Linker script is in the config directory, not in Modules as the
# Makefile says.
python_lib = get_python_lib(standard_lib=1)
ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
python_exp = os.path.join(python_lib, 'config', 'python.exp')
g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
global _config_vars global _config_vars
_config_vars = g _config_vars = g

20
Lib/distutils/tests/test_build_ext.py
View file

@ -31,12 +31,11 @@ class BuildExtTestCase(TempdirManager,
self.tmp_dir = self.mkdtemp() self.tmp_dir = self.mkdtemp()
self.sys_path = sys.path, sys.path[:] self.sys_path = sys.path, sys.path[:]
sys.path.append(self.tmp_dir) sys.path.append(self.tmp_dir)
if sys.version > "2.6": import site
import site self.old_user_base = site.USER_BASE
self.old_user_base = site.USER_BASE site.USER_BASE = self.mkdtemp()
site.USER_BASE = self.mkdtemp() from distutils.command import build_ext
from distutils.command import build_ext build_ext.USER_BASE = site.USER_BASE
build_ext.USER_BASE = site.USER_BASE
def test_build_ext(self): def test_build_ext(self):
global ALREADY_TESTED global ALREADY_TESTED
@ -84,11 +83,10 @@ class BuildExtTestCase(TempdirManager,
support.unload('xx') support.unload('xx')
sys.path = self.sys_path[0] sys.path = self.sys_path[0]
sys.path[:] = self.sys_path[1] sys.path[:] = self.sys_path[1]
if sys.version > "2.6": import site
import site site.USER_BASE = self.old_user_base
site.USER_BASE = self.old_user_base from distutils.command import build_ext
from distutils.command import build_ext build_ext.USER_BASE = self.old_user_base
build_ext.USER_BASE = self.old_user_base
super(BuildExtTestCase, self).tearDown() super(BuildExtTestCase, self).tearDown()
def test_solaris_enable_shared(self): def test_solaris_enable_shared(self):