Merged revisions 77759,77761 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77759 | tarek.ziade | 2010-01-26 22:21:54 +0100 (Tue, 26 Jan 2010) | 1 line
reintroduced the names in Distutils for APIs that were relocated
........
r77761 | tarek.ziade | 2010-01-26 23:46:15 +0100 (Tue, 26 Jan 2010) | 1 line
added local get_platform/set_platform APIs in distutils.sysconfig
........
diff --git a/Lib/distutils/command/bdist.py b/Lib/distutils/command/bdist.py
index a79982b..72b0cef 100644
--- a/Lib/distutils/command/bdist.py
+++ b/Lib/distutils/command/bdist.py
@@ -6,8 +6,8 @@
__revision__ = "$Id$"
import os
-from sysconfig import get_platform
+from distutils.util import get_platform
from distutils.core import Command
from distutils.errors import DistutilsPlatformError, DistutilsOptionError
diff --git a/Lib/distutils/command/bdist_dumb.py b/Lib/distutils/command/bdist_dumb.py
index c16125f..c2af95f 100644
--- a/Lib/distutils/command/bdist_dumb.py
+++ b/Lib/distutils/command/bdist_dumb.py
@@ -8,8 +8,9 @@
import os
-from sysconfig import get_python_version, get_platform
+from sysconfig import get_python_version
+from distutils.util import get_platform
from distutils.core import Command
from distutils.dir_util import remove_tree, ensure_relative
from distutils.errors import DistutilsPlatformError
diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py
index f920548..404f215 100644
--- a/Lib/distutils/command/bdist_msi.py
+++ b/Lib/distutils/command/bdist_msi.py
@@ -6,6 +6,8 @@
"""
Implements the bdist_msi command.
"""
+import sys, os
+from sysconfig import get_python_version
import sys, os
from distutils.core import Command
@@ -15,6 +17,7 @@
from distutils.errors import DistutilsOptionError
from distutils.util import get_platform
from distutils import log
+
import msilib
from msilib import schema, sequence, text
from msilib import Directory, Feature, Dialog, add_data
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py
index 2cf2823..71cc798 100644
--- a/Lib/distutils/command/bdist_wininst.py
+++ b/Lib/distutils/command/bdist_wininst.py
@@ -8,12 +8,13 @@
import sys
import os
-from sysconfig import get_python_version, get_platform
+from sysconfig import get_python_version
from distutils.core import Command
from distutils.dir_util import remove_tree
from distutils.errors import DistutilsOptionError, DistutilsPlatformError
from distutils import log
+from distutils.util import get_platform
class bdist_wininst(Command):
diff --git a/Lib/distutils/command/build.py b/Lib/distutils/command/build.py
index d7b0e3c..4d30f8f 100644
--- a/Lib/distutils/command/build.py
+++ b/Lib/distutils/command/build.py
@@ -5,8 +5,8 @@
__revision__ = "$Id$"
import sys, os
-from sysconfig import get_platform
+from distutils.util import get_platform
from distutils.core import Command
from distutils.errors import DistutilsOptionError
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 39d37da..8f41fac 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -9,14 +9,12 @@
import sys, os, re
from warnings import warn
-from sysconfig import get_platform
-
+from distutils.util import get_platform
from distutils.core import Command
from distutils.errors import *
from distutils.ccompiler import customize_compiler
from distutils.dep_util import newer_group
from distutils.extension import Extension
-
from distutils import log
# this keeps compatibility from 2.3 to 2.5
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 1f8d238..2a6d4dd 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -7,15 +7,14 @@
import sys
import os
-from sysconfig import (get_config_vars, get_platform, get_paths, get_path,
- get_config_var)
+from sysconfig import get_config_vars, get_paths, get_path, get_config_var
from distutils import log
from distutils.core import Command
from distutils.debug import DEBUG
from distutils.errors import DistutilsPlatformError
from distutils.file_util import write_file
-from distutils.util import convert_path, change_root
+from distutils.util import convert_path, change_root, get_platform
from distutils.errors import DistutilsOptionError
def _subst_vars(s, local_vars):