17 files changed, 26 insertions, 26 deletions
diff --git a/distutils2/command/build_ext.py b/distutils2/command/build_ext.py
index 0d973f5..ad2077b 100644
--- a/distutils2/command/build_ext.py
+++ b/distutils2/command/build_ext.py
@@ -8,8 +8,8 @@ import os
 import re
 import sys
 import logging
-import sysconfig
 
+from distutils2._backport import sysconfig
 from distutils2.util import get_platform
 from distutils2.command.cmd import Command
 from distutils2.errors import (CCompilerError, CompileError, PackagingError,
diff --git a/distutils2/command/build_scripts.py b/distutils2/command/build_scripts.py
index 5da00d5..a61f382 100644
--- a/distutils2/command/build_scripts.py
+++ b/distutils2/command/build_scripts.py
@@ -2,8 +2,8 @@
 
 import os
 import re
-import sysconfig
 
+from distutils2._backport import sysconfig
 from distutils2.command.cmd import Command
 from distutils2.util import convert_path, newer, detect_encoding, fsencode
 from distutils2 import logger
diff --git a/distutils2/command/install_data.py b/distutils2/command/install_data.py
index ed71450..dc64e78 100644
--- a/distutils2/command/install_data.py
+++ b/distutils2/command/install_data.py
@@ -4,7 +4,7 @@
 
 import os, sys
 from shutil import Error
-from sysconfig import get_paths, format_value
+from distutils2._backport.sysconfig import get_paths, format_value
 from distutils2 import logger
 from distutils2.util import convert_path
 from distutils2.command.cmd import Command
diff --git a/distutils2/command/install_dist.py b/distutils2/command/install_dist.py
index 216c9e0..5c591b1 100644
--- a/distutils2/command/install_dist.py
+++ b/distutils2/command/install_dist.py
@@ -3,9 +3,9 @@
 import sys
 import os
 
-import sysconfig
-from sysconfig import get_config_vars, get_paths, get_path, get_config_var
-
+from distutils2._backport import sysconfig
+from distutils2._backport.sysconfig import (get_config_vars, get_paths,
+                                            get_path, get_config_var)
 from distutils2 import logger
 from distutils2.command.cmd import Command
 from distutils2.errors import PackagingPlatformError
diff --git a/distutils2/compiler/__init__.py b/distutils2/compiler/__init__.py
index d3bbd9a..2f95319 100644
--- a/distutils2/compiler/__init__.py
+++ b/distutils2/compiler/__init__.py
@@ -16,8 +16,8 @@ set_compiler, show_compilers.
 import os
 import sys
 import re
-import sysconfig
 
+from distutils2._backport import sysconfig
 from distutils2.util import resolve_name
 from distutils2.errors import PackagingPlatformError
 from distutils2 import logger
diff --git a/distutils2/compiler/cygwinccompiler.py b/distutils2/compiler/cygwinccompiler.py
index 15c409a..b580f66 100644
--- a/distutils2/compiler/cygwinccompiler.py
+++ b/distutils2/compiler/cygwinccompiler.py
@@ -54,7 +54,7 @@ from distutils2.compiler.unixccompiler import UnixCCompiler
 from distutils2.util import write_file
 from distutils2.errors import PackagingExecError, CompileError, UnknownFileError
 from distutils2.util import get_compiler_versions
-import sysconfig
+from distutils2._backport import sysconfig
 
 
 def get_msvcr():
diff --git a/distutils2/compiler/unixccompiler.py b/distutils2/compiler/unixccompiler.py
index 679e5ef..e80a030 100644
--- a/distutils2/compiler/unixccompiler.py
+++ b/distutils2/compiler/unixccompiler.py
@@ -21,7 +21,7 @@ from distutils2.compiler import gen_preprocess_options, gen_lib_options
 from distutils2.errors import (PackagingExecError, CompileError,
                                LibError, LinkError)
 from distutils2 import logger
-import sysconfig
+from distutils2._backport import sysconfig
 
 
 # XXX Things not currently handled:
diff --git a/distutils2/create.py b/distutils2/create.py
index 2f25375..52f4895 100644
--- a/distutils2/create.py
+++ b/distutils2/create.py
@@ -25,13 +25,13 @@ import imp
 import sys
 import glob
 import shutil
-import sysconfig
+from distutils2._backport import sysconfig
 if 'any' not in dir(__builtins__):
     from distutils2._backport import any
 try:
     from hashlib import md5
-except ImportError:
-    from distutils2._backport.hashlib import md5
+except ImportError: #<2.5
+    from md5 import md5
 from textwrap import dedent
 from distutils2.util import cmp_to_key, detect_encoding
 from ConfigParser import RawConfigParser
diff --git a/distutils2/database.py b/distutils2/database.py
index 985dd56..e6fdec1 100644
--- a/distutils2/database.py
+++ b/distutils2/database.py
@@ -8,8 +8,8 @@ import sys
 import zipimport
 try:
     from hashlib import md5
-except ImportError:
-    from _backport.hashlib import md5
+except ImportError: #<2.5
+    from md5 import md5
 from distutils2 import logger
 from distutils2.errors import PackagingError
 from distutils2.version import suggest_normalized_version, VersionPredicate
diff --git a/distutils2/tests/test_command_build_ext.py b/distutils2/tests/test_command_build_ext.py
index 35287f5..e8b6ea9 100644
--- a/distutils2/tests/test_command_build_ext.py
+++ b/distutils2/tests/test_command_build_ext.py
@@ -2,9 +2,9 @@ import os
 import sys
 import site
 import shutil
-import sysconfig
 import textwrap
 from StringIO import StringIO
+from distutils2._backport import sysconfig
 from distutils2.dist import Distribution
 from distutils2.errors import (UnknownFileError, CompileError,
                               PackagingPlatformError)
diff --git a/distutils2/tests/test_command_build_scripts.py b/distutils2/tests/test_command_build_scripts.py
index a6f5139..6f4690b 100644
--- a/distutils2/tests/test_command_build_scripts.py
+++ b/distutils2/tests/test_command_build_scripts.py
@@ -2,7 +2,7 @@
 
 import os
 import sys
-import sysconfig
+from distutils2._backport import sysconfig
 from distutils2.dist import Distribution
 from distutils2.command.build_scripts import build_scripts
 from distutils2.tests import unittest, support
diff --git a/distutils2/tests/test_command_install_data.py b/distutils2/tests/test_command_install_data.py
index 719027f..ca79c63 100644
--- a/distutils2/tests/test_command_install_data.py
+++ b/distutils2/tests/test_command_install_data.py
@@ -1,7 +1,7 @@
 """Tests for distutils2.command.install_data."""
 import os
-import sysconfig
-from sysconfig import _get_default_scheme
+from distutils2._backport import sysconfig
+from distutils2._backport.sysconfig import _get_default_scheme
 from distutils2.tests import unittest, support
 from distutils2.command.install_data import install_data
 
diff --git a/distutils2/tests/test_create.py b/distutils2/tests/test_create.py
index 0413014..1180aa4 100644
--- a/distutils2/tests/test_create.py
+++ b/distutils2/tests/test_create.py
@@ -3,8 +3,8 @@ from StringIO import StringIO
 import codecs
 import os
 import sys
-import sysconfig
 from textwrap import dedent
+from distutils2._backport import sysconfig
 from distutils2.create import MainProgram, ask_yn, ask, main
 
 from distutils2.tests import support, unittest
diff --git a/distutils2/tests/test_cygwinccompiler.py b/distutils2/tests/test_cygwinccompiler.py
index d1d2dc8..e711ab3 100644
--- a/distutils2/tests/test_cygwinccompiler.py
+++ b/distutils2/tests/test_cygwinccompiler.py
@@ -1,7 +1,7 @@
 """Tests for distutils2.cygwinccompiler."""
 import os
 import sys
-import sysconfig
+from distutils2._backport import sysconfig
 from distutils2.compiler.cygwinccompiler import (
     check_config_h, get_msvcr,
     CONFIG_H_OK, CONFIG_H_NOTOK, CONFIG_H_UNCERTAIN)
diff --git a/distutils2/tests/test_dist.py b/distutils2/tests/test_dist.py
index f662624..a925298 100644
--- a/distutils2/tests/test_dist.py
+++ b/distutils2/tests/test_dist.py
@@ -4,7 +4,7 @@ import os
 import sys
 import logging
 import textwrap
-import sysconfig
+from distutils2._backport import sysconfig
 import distutils2.dist
 from StringIO import StringIO
 
diff --git a/distutils2/tests/test_unixccompiler.py b/distutils2/tests/test_unixccompiler.py
index 094ee5f..014998a 100644
--- a/distutils2/tests/test_unixccompiler.py
+++ b/distutils2/tests/test_unixccompiler.py
@@ -1,7 +1,7 @@
 """Tests for distutils2.unixccompiler."""
 import sys
 
-import sysconfig
+from distutils2._backport import sysconfig
 from distutils2.compiler.unixccompiler import UnixCCompiler
 from distutils2.tests import unittest
 
diff --git a/distutils2/util.py b/distutils2/util.py
index 1fb2b29..bacac0f 100644
--- a/distutils2/util.py
+++ b/distutils2/util.py
@@ -9,14 +9,13 @@ import errno
 import shutil
 import string
 try:
-    import hashlib
+    from hashlib import md5
 except ImportError: #<2.5
-    from _backport import hashlib
+    from md5 import md5
 import tarfile
 import zipfile
 import posixpath
 import subprocess
-import sysconfig
 try:
     from glob import iglob as std_iglob
 except ImportError:#<2.5
@@ -29,6 +28,7 @@ from distutils2 import logger
 from distutils2.errors import (PackagingPlatformError, PackagingFileError,
                               PackagingByteCompileError, PackagingExecError,
                               InstallationException, PackagingInternalError)
+from distutils2._backport import sysconfig
 
 _PLATFORM = None
 _DEFAULT_INSTALLER = 'distutils2'
@@ -1212,7 +1212,7 @@ def _write_record_file(record_path, installed_files):
             # do not put size and md5 hash, as in PEP-376
             writer.writerow((fpath, '', ''))
         else:
-            hash = hashlib.md5()
+            hash = md5()
             fp = open(fpath, 'rb')
             hash.update(fp.read())
             fp.close()