diff options
| author | Tarek Ziad? <tarek@ziade.org> | 2010-02-22 17:48:56 -0500 |
|---|---|---|
| committer | Tarek Ziad? <tarek@ziade.org> | 2010-02-22 17:48:56 -0500 |
| commit | a27379fa66a5a7695e9849146403a8c767126544 (patch) | |
| tree | 38812a3f89298f9619b146003138d29289339052 /src/distutils2 | |
| parent | ee6111744d0c6fc33d296523adcfc7d795ca0949 (diff) | |
| download | disutils2-a27379fa66a5a7695e9849146403a8c767126544.tar.gz | |
removed dir_util calls
Diffstat (limited to 'src/distutils2')
| -rw-r--r-- | src/distutils2/cmd.py | 2 | ||||
| -rw-r--r-- | src/distutils2/command/install_egg_info.py | 8 | ||||
| -rw-r--r-- | src/distutils2/command/sdist.py | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/distutils2/cmd.py b/src/distutils2/cmd.py index 2a7891d..7fc09b6 100644 --- a/src/distutils2/cmd.py +++ b/src/distutils2/cmd.py @@ -8,7 +8,7 @@ __revision__ = "$Id: cmd.py 75192 2009-10-02 23:49:48Z tarek.ziade $" import sys, os, re from distutils2.errors import DistutilsOptionError -from distutils2 import util, dir_util, file_util, dep_util +from distutils2 import util, file_util, dep_util from distutils2 import log # XXX see if we want to backport this diff --git a/src/distutils2/command/install_egg_info.py b/src/distutils2/command/install_egg_info.py index d86d570..79abe2f 100644 --- a/src/distutils2/command/install_egg_info.py +++ b/src/distutils2/command/install_egg_info.py @@ -5,7 +5,8 @@ a package's PKG-INFO metadata.""" from distutils2.cmd import Command -from distutils2 import log, dir_util +from distutils2 import log +from distutils2._backport.shutil import rmtree import os, sys, re class install_egg_info(Command): @@ -32,7 +33,10 @@ class install_egg_info(Command): def run(self): target = self.target if os.path.isdir(target) and not os.path.islink(target): - dir_util.remove_tree(target, dry_run=self.dry_run) + if self.dry_run: + pass # XXX + else: + rmtree(target) elif os.path.exists(target): self.execute(os.unlink,(self.target,),"Removing "+target) elif not os.path.isdir(self.install_dir): diff --git a/src/distutils2/command/sdist.py b/src/distutils2/command/sdist.py index 2f9ef5f..31a8ae6 100644 --- a/src/distutils2/command/sdist.py +++ b/src/distutils2/command/sdist.py @@ -16,7 +16,7 @@ except ImportError: from distutils2._backport.shutil import get_archive_formats from distutils2.core import Command -from distutils2 import dir_util, dep_util, file_util +from distutils2 import dep_util, file_util from distutils2.text_file import TextFile from distutils2.errors import (DistutilsPlatformError, DistutilsOptionError, DistutilsTemplateError) |