diff options
| author | ?ric Araujo <merwok@netwok.org> | 2011-01-29 22:41:40 +0100 |
|---|---|---|
| committer | ?ric Araujo <merwok@netwok.org> | 2011-01-29 22:41:40 +0100 |
| commit | 892f8f9425abbfeb27a9836e7d481cd6827ae5d7 (patch) | |
| tree | e8ab17106aa5435498af4c74f12e6c0195873ab2 /distutils2/command | |
| parent | 36dfd2a35c51a6e0b201cc0129f51bf9d019e564 (diff) | |
| parent | 2a6acdb06961c910480ae442ae6a8a780700ce43 (diff) | |
| download | disutils2-892f8f9425abbfeb27a9836e7d481cd6827ae5d7.tar.gz | |
Branch merge.
Addition: don?t use shutil from the stdlib in 2.7, it has the
logger=None bug (fixed in our backport).
Diffstat (limited to 'distutils2/command')
| -rw-r--r-- | distutils2/command/cmd.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/distutils2/command/cmd.py b/distutils2/command/cmd.py index 754fcf4..0e4d99e 100644 --- a/distutils2/command/cmd.py +++ b/distutils2/command/cmd.py @@ -10,14 +10,7 @@ import logging from distutils2.errors import DistutilsOptionError from distutils2 import util from distutils2 import logger - -# XXX see if we want to backport this -from distutils2._backport.shutil import copytree, copyfile, move - -try: - from shutil import make_archive -except ImportError: - from distutils2._backport.shutil import make_archive +from distutils2._backport.shutil import copytree, copyfile, move, make_archive class Command(object): |