Fix backport changesets part 3: backported modules.

shutil, sysconfig, tarfile and their tests have been updated to the
latest 3.2 version (except for test_tarfile which is not backported yet)
and edited to be compatible with 2.4.

Duplicates added in util during the Great Update have been deleted, as
well as functions I removed recently in packaging.  Unneeded modules in
_backport have been deleted or moved to d2.compat.

3 files changed, 6 insertions, 6 deletions

diff --git a/distutils2/command/build_scripts.py b/distutils2/command/build_scripts.py
index 8a48e07..300f692 100644
--- a/distutils2/command/build_scripts.py
+++ b/distutils2/command/build_scripts.py
@@ -3,11 +3,12 @@
 import os
 import re
 
-from distutils2._backport import sysconfig
 from distutils2.command.cmd import Command
-from distutils2.util import convert_path, newer, detect_encoding, fsencode
+from distutils2.util import convert_path, newer
 from distutils2 import logger
 from distutils2.compat import Mixin2to3
+from distutils2.compat import detect_encoding, fsencode
+from distutils2._backport import sysconfig
 
 
 # check if Python is called on the first line with this expression
diff --git a/distutils2/command/cmd.py b/distutils2/command/cmd.py
index 9076906..88c1784 100644
--- a/distutils2/command/cmd.py
+++ b/distutils2/command/cmd.py
@@ -2,11 +2,10 @@
 
 import os
 import re
-from shutil import copyfile, move
 from distutils2 import util
 from distutils2 import logger
-from distutils2.util import make_archive
 from distutils2.errors import PackagingOptionError
+from distutils2._backport.shutil import copyfile, move, make_archive
 
 
 class Command(object):
diff --git a/distutils2/command/sdist.py b/distutils2/command/sdist.py
index b124f73..978b009 100644
--- a/distutils2/command/sdist.py
+++ b/distutils2/command/sdist.py
@@ -4,15 +4,15 @@ import os
 import re
 import sys
 from StringIO import StringIO
-from shutil import rmtree
 
 from distutils2 import logger
-from distutils2.util import resolve_name, get_archive_formats
+from distutils2.util import resolve_name
 from distutils2.errors import (PackagingPlatformError, PackagingOptionError,
                                PackagingModuleError, PackagingFileError)
 from distutils2.command import get_command_names
 from distutils2.command.cmd import Command
 from distutils2.manifest import Manifest
+from distutils2._backport.shutil import get_archive_formats, rmtree
 
 
 def show_formats():