traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch #1046831: Use get_python_version where appropriate in sysconfig.py.

This commit is contained in:
Martin v. Löwis 2005-03-03 11:08:03 +00:00
parent c5574e809b
commit df37c8c1ad
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/distutils/sysconfig.py
View File

@ -34,7 +34,7 @@ python_build = os.path.isfile(landmark)
del argv0_path, landmark del argv0_path, landmark
def get_python_version (): def get_python_version():
"""Return a string containing the major and minor Python version, """Return a string containing the major and minor Python version,
leaving off the patchlevel. Sample return values could be '1.5' leaving off the patchlevel. Sample return values could be '1.5'
or '2.2'. or '2.2'.
@ -65,7 +65,7 @@ def get_python_inc(plat_specific=0, prefix=None):
if not os.path.exists(inc_dir): if not os.path.exists(inc_dir):
inc_dir = os.path.join(os.path.dirname(base), "Include") inc_dir = os.path.join(os.path.dirname(base), "Include")
return inc_dir return inc_dir
return os.path.join(prefix, "include", "python" + sys.version[:3]) return os.path.join(prefix, "include", "python" + get_python_version())
elif os.name == "nt": elif os.name == "nt":
return os.path.join(prefix, "include") return os.path.join(prefix, "include")
elif os.name == "mac": elif os.name == "mac":
@ -110,7 +110,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 sys.version < "2.2": if get_python_version() < "2.2":
return prefix return prefix
else: else:
return os.path.join(PREFIX, "Lib", "site-packages") return os.path.join(PREFIX, "Lib", "site-packages")
@ -189,7 +189,7 @@ def get_config_h_filename():
inc_dir = os.curdir inc_dir = os.curdir
else: else:
inc_dir = get_python_inc(plat_specific=1) inc_dir = get_python_inc(plat_specific=1)
if sys.version < '2.2': if get_python_version() < '2.2':
config_h = 'config.h' config_h = 'config.h'
else: else:
# The name of the config.h file changed in 2.2 # The name of the config.h file changed in 2.2
@ -378,7 +378,7 @@ def _init_posix():
if python_build: if python_build:
g['LDSHARED'] = g['BLDSHARED'] g['LDSHARED'] = g['BLDSHARED']
elif sys.version < '2.1': elif get_python_version() < '2.1':
# The following two branches are for 1.5.2 compatibility. # The following two branches are for 1.5.2 compatibility.
if sys.platform == 'aix4': # what about AIX 3.x ? if sys.platform == 'aix4': # what about AIX 3.x ?
# Linker script is in the config directory, not in Modules as the # Linker script is in the config directory, not in Modules as the
@ -405,7 +405,7 @@ def _init_posix():
# it's taken care of for them by the 'build_ext.get_libraries()' # it's taken care of for them by the 'build_ext.get_libraries()'
# method.) # method.)
g['LDSHARED'] = ("%s -L%s/lib -lpython%s" % g['LDSHARED'] = ("%s -L%s/lib -lpython%s" %
(linkerscript, PREFIX, sys.version[0:3])) (linkerscript, PREFIX, get_python_version()))
global _config_vars global _config_vars
_config_vars = g _config_vars = g

2
Misc/NEWS
View File

@ -61,6 +61,8 @@ Extension Modules
Library Library
------- -------
- Patch #1046831: Use get_python_version where appropriate in sysconfig.py.
- Patch #1117454: Remove code to special-case cookies without values - Patch #1117454: Remove code to special-case cookies without values
in LWPCookieJar. in LWPCookieJar.