[Python-checkins] r76870 - in python/branches/tarek_sysconfig: Lib/distutils/command/bdist.py Lib/distutils/command/bdist_dumb.py Lib/distutils/command/bdist_rpm.py Lib/distutils/command/bdist_wininst.py Lib/distutils/command/build.py Lib/distutils/command/build_ext.py Lib/distutils/command/build_scripts.py Lib/distutils/command/install.py Lib/distutils/extension.py Lib/distutils/sysconfig.py Lib/distutils/tests/support.py Lib/distutils/tests/test_build.py Lib/distutils/tests/test_build_ext.py Lib/distutils/tests/test_extension.py Lib/distutils/tests/test_sysconfig.py Lib/distutils/tests/test_unixccompiler.py Lib/distutils/tests/test_util.py Lib/distutils/unixccompiler.py Lib/distutils/util.py Lib/sysconfig.py Lib/test/test_sysconfig.py Makefile.pre.in
tarek.ziade
python-checkins at python.org
Fri Dec 18 00:36:28 CET 2009
Author: tarek.ziade
Date: Fri Dec 18 00:36:27 2009
New Revision: 76870
Log:
removed functions that where just moved (no deprecation anymore) and fixed usage and distutils tests
Modified:
python/branches/tarek_sysconfig/Lib/distutils/command/bdist.py
python/branches/tarek_sysconfig/Lib/distutils/command/bdist_dumb.py
python/branches/tarek_sysconfig/Lib/distutils/command/bdist_rpm.py
python/branches/tarek_sysconfig/Lib/distutils/command/bdist_wininst.py
python/branches/tarek_sysconfig/Lib/distutils/command/build.py
python/branches/tarek_sysconfig/Lib/distutils/command/build_ext.py
python/branches/tarek_sysconfig/Lib/distutils/command/build_scripts.py
python/branches/tarek_sysconfig/Lib/distutils/command/install.py
python/branches/tarek_sysconfig/Lib/distutils/extension.py
python/branches/tarek_sysconfig/Lib/distutils/sysconfig.py
python/branches/tarek_sysconfig/Lib/distutils/tests/support.py
python/branches/tarek_sysconfig/Lib/distutils/tests/test_build.py
python/branches/tarek_sysconfig/Lib/distutils/tests/test_build_ext.py
python/branches/tarek_sysconfig/Lib/distutils/tests/test_extension.py
python/branches/tarek_sysconfig/Lib/distutils/tests/test_sysconfig.py
python/branches/tarek_sysconfig/Lib/distutils/tests/test_unixccompiler.py
python/branches/tarek_sysconfig/Lib/distutils/tests/test_util.py
python/branches/tarek_sysconfig/Lib/distutils/unixccompiler.py
python/branches/tarek_sysconfig/Lib/distutils/util.py
python/branches/tarek_sysconfig/Lib/sysconfig.py
python/branches/tarek_sysconfig/Lib/test/test_sysconfig.py
python/branches/tarek_sysconfig/Makefile.pre.in
Modified: python/branches/tarek_sysconfig/Lib/distutils/command/bdist.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/command/bdist.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/command/bdist.py Fri Dec 18 00:36:27 2009
@@ -7,10 +7,10 @@
import os
from types import *
+from sysconfig import get_platform
+
from distutils.core import Command
from distutils.errors import *
-from distutils.util import get_platform
-
def show_formats():
"""Print list of available formats (arguments to "--format" option).
Modified: python/branches/tarek_sysconfig/Lib/distutils/command/bdist_dumb.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/command/bdist_dumb.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/command/bdist_dumb.py Fri Dec 18 00:36:27 2009
@@ -8,11 +8,11 @@
import os
+from sysconfig import get_python_version, get_platform
+
from distutils.core import Command
-from distutils.util import get_platform
from distutils.dir_util import remove_tree, ensure_relative
from distutils.errors import DistutilsPlatformError
-from distutils.sysconfig import get_python_version
from distutils import log
class bdist_dumb (Command):
Modified: python/branches/tarek_sysconfig/Lib/distutils/command/bdist_rpm.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/command/bdist_rpm.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/command/bdist_rpm.py Fri Dec 18 00:36:27 2009
@@ -7,12 +7,12 @@
import sys, os, string
from types import *
+from sysconfig import get_platform, get_python_version
+
from distutils.core import Command
from distutils.debug import DEBUG
-from distutils.util import get_platform
from distutils.file_util import write_file
from distutils.errors import *
-from distutils.sysconfig import get_python_version
from distutils import log
class bdist_rpm (Command):
Modified: python/branches/tarek_sysconfig/Lib/distutils/command/bdist_wininst.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/command/bdist_wininst.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/command/bdist_wininst.py Fri Dec 18 00:36:27 2009
@@ -6,11 +6,11 @@
__revision__ = "$Id$"
import sys, os, string
+from sysconfig import get_python_version, get_platform
+
from distutils.core import Command
-from distutils.util import get_platform
from distutils.dir_util import create_tree, remove_tree
from distutils.errors import *
-from distutils.sysconfig import get_python_version
from distutils import log
class bdist_wininst (Command):
Modified: python/branches/tarek_sysconfig/Lib/distutils/command/build.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/command/build.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/command/build.py Fri Dec 18 00:36:27 2009
@@ -5,9 +5,10 @@
__revision__ = "$Id$"
import sys, os
+from sysconfig import get_platform
+
from distutils.core import Command
from distutils.errors import DistutilsOptionError
-from distutils.util import get_platform
def show_compilers():
from distutils.ccompiler import show_compilers
Modified: python/branches/tarek_sysconfig/Lib/distutils/command/build_ext.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/command/build_ext.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/command/build_ext.py Fri Dec 18 00:36:27 2009
@@ -9,12 +9,14 @@
import sys, os, re
from warnings import warn
+from sysconfig import get_platform
+
from distutils.core import Command
from distutils.errors import *
-from distutils.sysconfig import customize_compiler, get_python_version
+from distutils.sysconfig import customize_compiler
from distutils.dep_util import newer_group
from distutils.extension import Extension
-from distutils.util import get_platform
+
from distutils import log
# this keeps compatibility from 2.3 to 2.5
@@ -172,8 +174,7 @@
self.user = None
def finalize_options(self):
- from distutils import sysconfig
-
+ _sysconfig = __import__('sysconfig')
self.set_undefined_options('build',
('build_lib', 'build_lib'),
('build_temp', 'build_temp'),
@@ -190,8 +191,8 @@
# Make sure Python's include directories (for Python.h, pyconfig.h,
# etc.) are in the include search path.
- py_include = sysconfig.get_python_inc()
- plat_py_include = sysconfig.get_python_inc(plat_specific=1)
+ py_include = _sysconfig.get_path('include')
+ plat_py_include = _sysconfig.get_path('platinclude')
if self.include_dirs is None:
self.include_dirs = self.distribution.include_dirs or []
if isinstance(self.include_dirs, str):
@@ -269,7 +270,7 @@
if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
# building third party extensions
self.library_dirs.append(os.path.join(sys.prefix, "lib",
- "python" + get_python_version(),
+ "python" + _sysconfig.get_python_version(),
"config"))
else:
# building python standard extensions
@@ -277,13 +278,13 @@
# for extensions under Linux or Solaris with a shared Python library,
# Python's library directory must be appended to library_dirs
- sysconfig.get_config_var('Py_ENABLE_SHARED')
+ _sysconfig.get_config_var('Py_ENABLE_SHARED')
if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu')
or sys.platform.startswith('sunos'))
- and sysconfig.get_config_var('Py_ENABLE_SHARED')):
+ and _sysconfig.get_config_var('Py_ENABLE_SHARED')):
if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
# building third party extensions
- self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
+ self.library_dirs.append(_sysconfig.get_config_var('LIBDIR'))
else:
# building python standard extensions
self.library_dirs.append('.')
@@ -718,13 +719,13 @@
of the file from which it will be loaded (eg. "foo/bar.so", or
"foo\bar.pyd").
"""
- from distutils.sysconfig import get_config_var
+ _sysconfig = __import__('sysconfig')
ext_path = ext_name.split('.')
# OS/2 has an 8 character module (extension) limit :-(
if os.name == "os2":
ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
# extensions in debug_mode are named 'module_d.pyd' under windows
- so_ext = get_config_var('SO')
+ so_ext = _sysconfig.get_config_var('SO')
if os.name == 'nt' and self.debug:
return os.path.join(*ext_path) + '_d' + so_ext
return os.path.join(*ext_path) + so_ext
@@ -784,14 +785,13 @@
# extensions, it is a reference to the original list
return ext.libraries + [pythonlib]
elif sys.platform[:6] == "atheos":
- from distutils import sysconfig
-
+ _sysconfig = __import__('sysconfig')
template = "python%d.%d"
pythonlib = (template %
(sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
# Get SHLIBS from Makefile
extra = []
- for lib in sysconfig.get_config_var('SHLIBS').split():
+ for lib in _sysconfig.get_config_var('SHLIBS').split():
if lib.startswith('-l'):
extra.append(lib[2:])
else:
@@ -805,8 +805,8 @@
return ext.libraries
else:
- from distutils import sysconfig
- if sysconfig.get_config_var('Py_ENABLE_SHARED'):
+ _sysconfig = __import__('sysconfig')
+ if _sysconfig.get_config_var('Py_ENABLE_SHARED'):
template = "python%d.%d"
pythonlib = (template %
(sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
Modified: python/branches/tarek_sysconfig/Lib/distutils/command/build_scripts.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/command/build_scripts.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/command/build_scripts.py Fri Dec 18 00:36:27 2009
@@ -6,7 +6,6 @@
import os, re
from stat import ST_MODE
-from distutils import sysconfig
from distutils.core import Command
from distutils.dep_util import newer
from distutils.util import convert_path
@@ -57,6 +56,7 @@
ie. starts with "\#!" and contains "python"), then adjust the first
line to refer to the current Python interpreter as we copy.
"""
+ _sysconfig = __import__('sysconfig')
self.mkpath(self.build_dir)
outfiles = []
for script in self.scripts:
@@ -94,16 +94,16 @@
self.build_dir)
if not self.dry_run:
outf = open(outfile, "w")
- if not sysconfig.python_build:
+ if not _sysconfig.is_python_build():
outf.write("#!%s%s\n" %
(self.executable,
post_interp))
else:
outf.write("#!%s%s\n" %
(os.path.join(
- sysconfig.get_config_var("BINDIR"),
- "python%s%s" % (sysconfig.get_config_var("VERSION"),
- sysconfig.get_config_var("EXE"))),
+ _sysconfig.get_config_var("BINDIR"),
+ "python%s%s" % (_sysconfig.get_config_var("VERSION"),
+ _sysconfig.get_config_var("EXE"))),
post_interp))
outf.writelines(f.readlines())
outf.close()
Modified: python/branches/tarek_sysconfig/Lib/distutils/command/install.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/command/install.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/command/install.py Fri Dec 18 00:36:27 2009
@@ -7,14 +7,14 @@
import sys
import os
+from sysconfig import get_config_vars, get_platform
+
from distutils import log
from distutils.core import Command
from distutils.debug import DEBUG
-from distutils.sysconfig import get_config_vars
from distutils.errors import DistutilsPlatformError
from distutils.file_util import write_file
from distutils.util import convert_path, subst_vars, change_root
-from distutils.util import get_platform
from distutils.errors import DistutilsOptionError
# this keeps compatibility from 2.3 to 2.5
Modified: python/branches/tarek_sysconfig/Lib/distutils/extension.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/extension.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/extension.py Fri Dec 18 00:36:27 2009
@@ -135,14 +135,17 @@
def read_setup_file(filename):
"""Reads a Setup file and returns Extension instances."""
- from distutils.sysconfig import (parse_makefile, expand_makefile_vars,
+ warnings.warn('distutils.extensions.read_setup_file is deprecated. '
+ 'It will be removed in the next Python release.')
+ _sysconfig = __import__('sysconfig')
+ from distutils.sysconfig import (expand_makefile_vars,
_variable_rx)
from distutils.text_file import TextFile
from distutils.util import split_quoted
# First pass over the file to gather "VAR = VALUE" assignments.
- vars = parse_makefile(filename)
+ vars = _sysconfig._parse_makefile(filename)
# Second pass to gobble up the real content: lines of the form
# <module> ... [<sourcefile> ...] [<cpparg> ...] [<library> ...]
@@ -162,7 +165,10 @@
file.warn("'%s' lines not handled yet" % line)
continue
- line = expand_makefile_vars(line, vars)
+ with warnings.catch_warnings():
+ warnings.simplefilter("ignore")
+ line = expand_makefile_vars(line, vars)
+
words = split_quoted(line)
# NB. this parses a slightly different syntax than the old
Modified: python/branches/tarek_sysconfig/Lib/distutils/sysconfig.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/sysconfig.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/sysconfig.py Fri Dec 18 00:36:27 2009
@@ -32,8 +32,9 @@
"""
if compiler.compiler_type == "unix":
(cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
+ _sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+ 'CCSHARED', 'LDSHARED', 'SO', 'AR',
+ 'ARFLAGS')
if 'CC' in os.environ:
cc = os.environ['CC']
@@ -91,20 +92,10 @@
return super(_DeprecatedBool, self).__nonzero__()
def _python_build():
- return _DeprecatedBool(_sysconfig._PYTHON_BUILD)
+ return _DeprecatedBool(_sysconfig.is_python_build())
python_build = _python_build()
-def get_python_version():
- """This function is deprecated.
-
- Return a string containing the major and minor Python version,
- leaving off the patchlevel. Sample return values could be '1.5'
- or '2.2'.
- """
- warn(_DEPRECATION_MSG % 'get_python_version', DeprecationWarning)
- return _sysconfig.get_python_version()
-
def get_python_inc(plat_specific=0, prefix=None):
"""This function is deprecated.
@@ -125,7 +116,7 @@
vars = {'base': prefix}
return get_path('include', vars=vars)
- if plat_specific:
+ if not plat_specific:
return get_path('include')
else:
return get_path('platinclude')
@@ -241,28 +232,3 @@
else:
break
return s
-
-def get_config_vars(*args):
- """This function is deprecated.
-
- With no arguments, return a dictionary of all configuration
- variables relevant for the current platform. Generally this includes
- everything needed to build extensions and install both pure modules and
- extensions. On Unix, this means every variable defined in Python's
- installed Makefile; on Windows and Mac OS it's a much smaller set.
-
- With arguments, return a list of values that result from looking up
- each argument in the configuration variable dictionary.
- """
- warn(_DEPRECATION_MSG % 'get_config_vars', DeprecationWarning)
- return _sysconfig.get_config_vars(*args)
-
-def get_config_var(name):
- """This function is deprecated.
-
- Return the value of a single variable using the dictionary
- returned by 'get_config_vars()'. Equivalent to
- get_config_vars().get(name)
- """
- warn(_DEPRECATION_MSG % 'get_config_var', DeprecationWarning)
- return _sysconfig.get_config_var(name)
Modified: python/branches/tarek_sysconfig/Lib/distutils/tests/support.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/tests/support.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/tests/support.py Fri Dec 18 00:36:27 2009
@@ -3,11 +3,19 @@
import shutil
import tempfile
from copy import deepcopy
+import warnings
from distutils import log
from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
from distutils.core import Distribution
+def capture_warnings(func):
+ def _capture_warnings(*args, **kw):
+ with warnings.catch_warnings():
+ warnings.simplefilter("ignore")
+ return func(*args, **kw)
+ return _capture_warnings
+
class LoggingSilencer(object):
def setUp(self):
Modified: python/branches/tarek_sysconfig/Lib/distutils/tests/test_build.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/tests/test_build.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/tests/test_build.py Fri Dec 18 00:36:27 2009
@@ -5,7 +5,7 @@
from distutils.command.build import build
from distutils.tests import support
-from distutils.util import get_platform
+from sysconfig import get_platform
class BuildTestCase(support.TempdirManager,
support.LoggingSilencer,
Modified: python/branches/tarek_sysconfig/Lib/distutils/tests/test_build_ext.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/tests/test_build_ext.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/tests/test_build_ext.py Fri Dec 18 00:36:27 2009
@@ -177,11 +177,10 @@
cmd = build_ext(dist)
cmd.finalize_options()
- from distutils import sysconfig
- py_include = sysconfig.get_python_inc()
+ py_include = sysconfig.get_path('include')
self.assertTrue(py_include in cmd.include_dirs)
- plat_py_include = sysconfig.get_python_inc(plat_specific=1)
+ plat_py_include = sysconfig.get_path('platinclude')
self.assertTrue(plat_py_include in cmd.include_dirs)
# make sure cmd.libraries is turned into a list
Modified: python/branches/tarek_sysconfig/Lib/distutils/tests/test_extension.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/tests/test_extension.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/tests/test_extension.py Fri Dec 18 00:36:27 2009
@@ -5,9 +5,11 @@
from test.test_support import check_warnings
from distutils.extension import read_setup_file, Extension
+from distutils.tests import support
class ExtensionTestCase(unittest.TestCase):
+ @support.capture_warnings
def test_read_setup_file(self):
# trying to read a Setup file
# (sample extracted from the PyGame project)
Modified: python/branches/tarek_sysconfig/Lib/distutils/tests/test_sysconfig.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/tests/test_sysconfig.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/tests/test_sysconfig.py Fri Dec 18 00:36:27 2009
@@ -27,10 +27,12 @@
elif os.path.isdir(path):
shutil.rmtree(path)
+ @support.capture_warnings
def test_get_config_h_filename(self):
config_h = sysconfig.get_config_h_filename()
self.assertTrue(os.path.isfile(config_h), config_h)
+ @support.capture_warnings
def test_get_python_lib(self):
lib_dir = sysconfig.get_python_lib()
# XXX doesn't work on Linux when Python was never installed before
@@ -39,20 +41,17 @@
self.assertNotEqual(sysconfig.get_python_lib(),
sysconfig.get_python_lib(prefix=TESTFN))
+ @support.capture_warnings
def test_get_python_inc(self):
inc_dir = sysconfig.get_python_inc()
# This is not much of a test. We make sure Python.h exists
# in the directory returned by get_python_inc() but we don't know
# it is the correct file.
+
self.assertTrue(os.path.isdir(inc_dir), inc_dir)
python_h = os.path.join(inc_dir, "Python.h")
self.assertTrue(os.path.isfile(python_h), python_h)
- def test_get_config_vars(self):
- cvars = sysconfig.get_config_vars()
- self.assertTrue(isinstance(cvars, dict))
- self.assertTrue(cvars)
-
def test_customize_compiler(self):
# not testing if default compiler is not unix
@@ -73,6 +72,7 @@
sysconfig.customize_compiler(comp)
self.assertEquals(comp.exes['archiver'], 'my_ar -arflags')
+ @support.capture_warnings
def test_parse_makefile_base(self):
self.makefile = test.test_support.TESTFN
fd = open(self.makefile, 'w')
Modified: python/branches/tarek_sysconfig/Lib/distutils/tests/test_unixccompiler.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/tests/test_unixccompiler.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/tests/test_unixccompiler.py Fri Dec 18 00:36:27 2009
@@ -2,7 +2,7 @@
import sys
import unittest
-from distutils import sysconfig
+import sysconfig
from distutils.unixccompiler import UnixCCompiler
class UnixCCompilerTestCase(unittest.TestCase):
Modified: python/branches/tarek_sysconfig/Lib/distutils/tests/test_util.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/tests/test_util.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/tests/test_util.py Fri Dec 18 00:36:27 2009
@@ -6,15 +6,14 @@
from StringIO import StringIO
import subprocess
+from sysconfig import get_config_vars, get_platform
from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
-from distutils.util import (get_platform, convert_path, change_root,
+from distutils.util import (convert_path, change_root,
check_environ, split_quoted, strtobool,
rfc822_escape, get_compiler_versions,
_find_exe_version, _MAC_OS_X_LD_VERSION,
byte_compile)
from distutils import util
-from distutils.sysconfig import get_config_vars
-from distutils import sysconfig
from distutils.tests import support
from distutils.version import LooseVersion
Modified: python/branches/tarek_sysconfig/Lib/distutils/unixccompiler.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/unixccompiler.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/unixccompiler.py Fri Dec 18 00:36:27 2009
@@ -17,8 +17,9 @@
import os, sys
from types import StringType, NoneType
+sysconfig = __import__('sysconfig')
+#import sysconfig
-from distutils import sysconfig
from distutils.dep_util import newer
from distutils.ccompiler import \
CCompiler, gen_preprocess_options, gen_lib_options
@@ -75,7 +76,7 @@
if 'ARCHFLAGS' in os.environ and not stripArch:
# User specified different -arch flags in the environ,
- # see also distutils.sysconfig
+ # see also sysconfig
compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
if stripSysroot:
Modified: python/branches/tarek_sysconfig/Lib/distutils/util.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/distutils/util.py (original)
+++ python/branches/tarek_sysconfig/Lib/distutils/util.py Fri Dec 18 00:36:27 2009
@@ -18,38 +18,6 @@
_sysconfig = __import__('sysconfig')
-def get_platform():
- """This function is deprecated.
-
- Return a string that identifies the current platform.
-
- This is used mainly to distinguish platform-specific build directories and
- platform-specific built distributions. Typically includes the OS name
- and version and the architecture (as supplied by 'os.uname()'),
- although the exact information included depends on the OS; eg. for IRIX
- the architecture isn't particularly important (IRIX only runs on SGI
- hardware), but for Linux the kernel version isn't particularly
- important.
-
- Examples of returned values:
- linux-i586
- linux-alpha (?)
- solaris-2.6-sun4u
- irix-5.3
- irix64-6.2
-
- Windows will return one of:
- win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
- win-ia64 (64bit Windows on Itanium)
- win32 (all others - specifically, sys.platform is returned)
-
- For other non-POSIX platforms, currently just returns 'sys.platform'.
- """
- msg = ("distutils.sysconfig.get_platform is deprecated. "
- "Use sysconfig.get_platform instead.")
- warn(msg, DeprecationWarning)
- return _sysconfig.get_platform()
-
def convert_path(pathname):
"""Return 'pathname' as a name that will work on the native filesystem.
@@ -136,7 +104,7 @@
os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
if 'PLAT' not in os.environ:
- os.environ['PLAT'] = get_platform()
+ os.environ['PLAT'] = _sysconfig.get_platform()
_environ_checked = 1
Modified: python/branches/tarek_sysconfig/Lib/sysconfig.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/sysconfig.py (original)
+++ python/branches/tarek_sysconfig/Lib/sysconfig.py Fri Dec 18 00:36:27 2009
@@ -56,10 +56,10 @@
'data' : '$userbase',
},
'nt_user': {
- 'stdlib': '$userbase/Python/$py_version_nodot',
- 'platstdlib': '$userbase/Python/$py_version_nodot',
- 'purelib': '$userbase/Python/$py_version_nodot/site-packages',
- 'platlib': '$userbase/Python/$py_version_nodot/site-packages',
+ 'stdlib': '$userbase/Python$py_version_nodot',
+ 'platstdlib': '$userbase/Python$py_version_nodot',
+ 'purelib': '$userbase/Python$py_version_nodot/site-packages',
+ 'platlib': '$userbase/Python$py_version_nodot/site-packages',
'include': '$userbase/Python$py_version_nodot/Include',
'scripts': '$userbase/Scripts',
'data' : '$userbase',
@@ -95,18 +95,18 @@
if os.name == "nt" and "\\pcbuild\\amd64" in _PROJECT_BASE[-14:].lower():
_PROJECT_BASE = abspath(os.path.join(_PROJECT_BASE, pardir, pardir))
-def _python_build():
+def is_python_build():
for fn in ("Setup.dist", "Setup.local"):
if os.path.isfile(os.path.join(_PROJECT_BASE, "Modules", fn)):
return True
return False
-_PYTHON_BUILD = _python_build()
+_PYTHON_BUILD = is_python_build()
if _PYTHON_BUILD:
for scheme in ('posix_prefix', 'posix_home'):
- _INSTALL_SCHEMES[scheme]['include'] = '$projectbase'
- _INSTALL_SCHEMES[scheme]['platinclude'] = '$srcdir/Include'
+ _INSTALL_SCHEMES[scheme]['include'] = '$projectbase/Include'
+ _INSTALL_SCHEMES[scheme]['platinclude'] = '$srcdir'
def _subst_vars(s, local_vars):
import re
Modified: python/branches/tarek_sysconfig/Lib/test/test_sysconfig.py
==============================================================================
--- python/branches/tarek_sysconfig/Lib/test/test_sysconfig.py (original)
+++ python/branches/tarek_sysconfig/Lib/test/test_sysconfig.py Fri Dec 18 00:36:27 2009
@@ -90,8 +90,8 @@
# XXX make it os independant
scheme = get_paths()
wanted = [('data', '/usr/local'),
- ('include', '/Users/tarek/Dev/svn.python.org/tarek_sysconfig'),
- ('platinclude', './Include'),
+ ('include', '/Users/tarek/Dev/svn.python.org/tarek_sysconfig/Include'),
+ ('platinclude', '.'),
('platlib', '/usr/local/lib/python'),
('platstdlib', '/usr/local/lib/python'),
('purelib', '/usr/local/lib/python'),
Modified: python/branches/tarek_sysconfig/Makefile.pre.in
==============================================================================
--- python/branches/tarek_sysconfig/Makefile.pre.in (original)
+++ python/branches/tarek_sysconfig/Makefile.pre.in Fri Dec 18 00:36:27 2009
@@ -393,7 +393,7 @@
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
platform: $(BUILDPYTHON)
- $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
+ $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
# Build the shared modules
More information about the Python-checkins
mailing list