refactored sysconfig and other backported modules

6 files changed, 40 insertions, 28 deletions

diff --git a/src/distutils2/command/bdist_dumb.py b/src/distutils2/command/bdist_dumb.py
index 0576da9..fe9d24c 100644
--- a/src/distutils2/command/bdist_dumb.py
+++ b/src/distutils2/command/bdist_dumb.py
@@ -7,9 +7,10 @@ $exec_prefix)."""
 __revision__ = "$Id: bdist_dumb.py 77761 2010-01-26 22:46:15Z tarek.ziade $"
 
 import os
-
-from sysconfig import get_python_version
-
+try:
+    from sysconfig import get_python_version
+except ImportError:
+    from distutils2._backport.sysconfig import get_python_version
 from distutils2.util import get_platform
 from distutils2.core import Command
 from distutils2.dir_util import remove_tree, ensure_relative
diff --git a/src/distutils2/command/bdist_wininst.py b/src/distutils2/command/bdist_wininst.py
index c668f6b..793c4b7 100644
--- a/src/distutils2/command/bdist_wininst.py
+++ b/src/distutils2/command/bdist_wininst.py
@@ -8,9 +8,10 @@ __revision__ = "$Id: bdist_wininst.py 77761 2010-01-26 22:46:15Z tarek.ziade $"
 import sys
 import os
 import string
-
-from sysconfig import get_python_version
-
+try:
+    from sysconfig import get_python_version
+except ImportError:
+    from distutils2._backport.sysconfig import get_python_version
 from distutils2.core import Command
 from distutils2.dir_util import remove_tree
 from distutils2.errors import DistutilsOptionError, DistutilsPlatformError
diff --git a/src/distutils2/command/build_ext.py b/src/distutils2/command/build_ext.py
index ed3e7fa..aadc45b 100644
--- a/src/distutils2/command/build_ext.py
+++ b/src/distutils2/command/build_ext.py
@@ -16,6 +16,10 @@ from distutils2.ccompiler import customize_compiler
 from distutils2.dep_util import newer_group
 from distutils2.extension import Extension
 from distutils2 import log
+try:
+    import sysconfig
+except ImportError:
+    from distutils2._backport import sysconfig
 
 # this keeps compatibility from 2.3 to 2.5
 if sys.version < "2.6":
@@ -172,7 +176,6 @@ class build_ext(Command):
         self.user = None
 
     def finalize_options(self):
-        _sysconfig = __import__('sysconfig')
         self.set_undefined_options('build',
                                    ('build_lib', 'build_lib'),
                                    ('build_temp', 'build_temp'),
@@ -189,8 +192,8 @@ class build_ext(Command):
 
         # Make sure Python's include directories (for Python.h, pyconfig.h,
         # etc.) are in the include search path.
-        py_include = _sysconfig.get_path('include')
-        plat_py_include = _sysconfig.get_path('platinclude')
+        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):
@@ -268,7 +271,7 @@ class build_ext(Command):
             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" + _sysconfig.get_python_version(),
+                                  "python" + sysconfig.get_python_version(),
                                                       "config"))
             else:
                 # building python standard extensions
@@ -276,13 +279,13 @@ class build_ext(Command):
 
         # 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('.')
@@ -717,13 +720,12 @@ class build_ext(Command):
         of the file from which it will be loaded (eg. "foo/bar.so", or
         "foo\bar.pyd").
         """
-        _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 = _sysconfig.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
@@ -783,13 +785,12 @@ class build_ext(Command):
             # extensions, it is a reference to the original list
             return ext.libraries + [pythonlib]
         elif sys.platform[:6] == "atheos":
-            _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:
@@ -803,8 +804,7 @@ class build_ext(Command):
             return ext.libraries
 
         else:
-            _sysconfig = __import__('sysconfig')
-            if _sysconfig.get_config_var('Py_ENABLE_SHARED'):
+            if sysconfig.get_config_var('Py_ENABLE_SHARED'):
                 template = "python%d.%d"
                 pythonlib = (template %
                              (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
diff --git a/src/distutils2/command/build_scripts.py b/src/distutils2/command/build_scripts.py
index aae0cb9..7a95827 100644
--- a/src/distutils2/command/build_scripts.py
+++ b/src/distutils2/command/build_scripts.py
@@ -10,6 +10,10 @@ from distutils2.core import Command
 from distutils2.dep_util import newer
 from distutils2.util import convert_path
 from distutils2 import log
+try:
+    import sysconfig
+except ImportError:
+    from distutils2._backport import sysconfig
 
 # check if Python is called on the first line with this expression
 first_line_re = re.compile('^#!.*python[0-9.]*([ \t].*)?$')
@@ -56,7 +60,6 @@ class build_scripts (Command):
         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 +97,16 @@ class build_scripts (Command):
                          self.build_dir)
                 if not self.dry_run:
                     outf = open(outfile, "w")
-                    if not _sysconfig.is_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()
diff --git a/src/distutils2/command/install.py b/src/distutils2/command/install.py
index facf163..c532b2a 100644
--- a/src/distutils2/command/install.py
+++ b/src/distutils2/command/install.py
@@ -6,8 +6,11 @@ __revision__ = "$Id: install.py 77949 2010-02-03 15:38:12Z tarek.ziade $"
 
 import sys
 import os
-
-from sysconfig import get_config_vars, get_paths, get_path, get_config_var
+try:
+    from sysconfig import get_config_vars, get_paths, get_path, get_config_var
+except ImportError:
+    from distutils2._backport.sysconfig import (get_config_vars, get_paths,
+                                                get_path, get_config_var)
 
 from distutils2 import log
 from distutils2.core import Command
diff --git a/src/distutils2/command/sdist.py b/src/distutils2/command/sdist.py
index b90204c..da2a2c1 100644
--- a/src/distutils2/command/sdist.py
+++ b/src/distutils2/command/sdist.py
@@ -9,10 +9,14 @@ import string
 import sys
 from glob import glob
 from warnings import warn
-from shutil import get_archive_formats
+
+try:
+    from shutil import get_archive_formats
+except ImportError:
+    from distutils2._backport.shutil import get_archive_formats
 
 from distutils2.core import Command
-from distutils2 import dir_util, dep_util, file_util, archive_util
+from distutils2 import dir_util, dep_util, file_util
 from distutils2.text_file import TextFile
 from distutils2.errors import (DistutilsPlatformError, DistutilsOptionError,
                               DistutilsTemplateError)