removed dir_util

4 files changed, 37 insertions, 12 deletions

diff --git a/src/distutils2/command/bdist_dumb.py b/src/distutils2/command/bdist_dumb.py
index fe9d24c..429725c 100644
--- a/src/distutils2/command/bdist_dumb.py
+++ b/src/distutils2/command/bdist_dumb.py
@@ -7,13 +7,13 @@ $exec_prefix)."""
 __revision__ = "$Id: bdist_dumb.py 77761 2010-01-26 22:46:15Z tarek.ziade $"
 
 import os
+from shutil import rmtree
 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
 from distutils2.errors import DistutilsPlatformError
 from distutils2 import log
 
@@ -130,4 +130,8 @@ class bdist_dumb (Command):
                                              filename))
 
         if not self.keep_temp:
-            remove_tree(self.bdist_dir, dry_run=self.dry_run)
+            if self.dry_run:
+                log.info('Removing %s' % self.bdist_dir)
+            else:
+                rmtree(self.bdist_dir)
+
diff --git a/src/distutils2/command/bdist_wininst.py b/src/distutils2/command/bdist_wininst.py
index fe2b2de..10f8bec 100644
--- a/src/distutils2/command/bdist_wininst.py
+++ b/src/distutils2/command/bdist_wininst.py
@@ -13,7 +13,6 @@ try:
 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
 from distutils2 import log
 from distutils2.util import get_platform
@@ -195,9 +194,10 @@ class bdist_wininst (Command):
         os.remove(arcname)
 
         if not self.keep_temp:
-            remove_tree(self.bdist_dir, dry_run=self.dry_run)
-
-    # run()
+            if self.dry_run:
+                log.info('Removing %s' % self.bdist_dir)
+            else:
+                rmtree(self.bdist_dir)
 
     def get_inidata (self):
         # Return data describing the installation.
diff --git a/src/distutils2/command/clean.py b/src/distutils2/command/clean.py
index 56f478c..baeaf05 100644
--- a/src/distutils2/command/clean.py
+++ b/src/distutils2/command/clean.py
@@ -7,8 +7,8 @@ Implements the Distutils 'clean' command."""
 __revision__ = "$Id: clean.py 70886 2009-03-31 20:50:59Z tarek.ziade $"
 
 import os
+from shutil import rmtree
 from distutils2.core import Command
-from distutils2.dir_util import remove_tree
 from distutils2 import log
 
 class clean(Command):
@@ -52,7 +52,10 @@ class clean(Command):
         # remove the build/temp.<plat> directory (unless it's already
         # gone)
         if os.path.exists(self.build_temp):
-            remove_tree(self.build_temp, dry_run=self.dry_run)
+            if self.dry_run:
+                log.info('Removing %s' % self.build_temp)
+            else:
+                rmtree(self.build_temp)
         else:
             log.debug("'%s' does not exist -- can't clean it",
                       self.build_temp)
@@ -63,7 +66,10 @@ class clean(Command):
                               self.bdist_base,
                               self.build_scripts):
                 if os.path.exists(directory):
-                    remove_tree(directory, dry_run=self.dry_run)
+                    if self.dry_run:
+                        log.info('Removing %s' % directory)
+                    else:
+                        rmtree(directory)
                 else:
                     log.warn("'%s' does not exist -- can't clean it",
                              directory)
diff --git a/src/distutils2/command/sdist.py b/src/distutils2/command/sdist.py
index da2a2c1..2f9ef5f 100644
--- a/src/distutils2/command/sdist.py
+++ b/src/distutils2/command/sdist.py
@@ -9,7 +9,7 @@ import string
 import sys
 from glob import glob
 from warnings import warn
-
+from shutil import rmtree
 try:
     from shutil import get_archive_formats
 except ImportError:
@@ -423,7 +423,7 @@ class sdist(Command):
         # put 'files' there; the 'mkpath()' is just so we don't die
         # if the manifest happens to be empty.
         self.mkpath(base_dir)
-        dir_util.create_tree(base_dir, files, dry_run=self.dry_run)
+        self.create_tree(base_dir, files, dry_run=self.dry_run)
 
         # And walk over the list of files, either making a hard link (if
         # os.link exists) to each one that doesn't already exist in its
@@ -480,10 +480,25 @@ class sdist(Command):
         self.archive_files = archive_files
 
         if not self.keep_temp:
-            dir_util.remove_tree(base_dir, dry_run=self.dry_run)
+            if self.dry_run:
+                log.info('Removing %s' % base_dir)
+            else:
+                rmtree(base_dir)
 
     def get_archive_files(self):
         """Return the list of archive files created when the command
         was run, or None if the command hasn't run yet.
         """
         return self.archive_files
+
+    def create_tree(self, base_dir, files, mode=0777, verbose=1, dry_run=0):
+        need_dir = {}
+        for file in files:
+            need_dir[os.path.join(base_dir, os.path.dirname(file))] = 1
+        need_dirs = need_dir.keys()
+        need_dirs.sort()
+
+        # Now create them
+        for dir in need_dirs:
+            self.mkpath(dir, mode, verbose=verbose, dry_run=dry_run)
+