diff options
author | Éric Araujo <merwok@netwok.org> | 2012-02-05 12:41:47 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2012-02-05 12:41:47 (GMT) |
commit | cd2a6033ac0bafd69a7cba2d132e092127acc895 (patch) | |
tree | 4e5d6c97edcf7056659a37371a24da12ef018172 /Lib/shutil.py | |
parent | bd249c1bae9e70368ca190ca8e60b3e5343e9344 (diff) | |
parent | 89dfd5cf80965fcf1d3fe4db8268f8acc67b5f64 (diff) | |
download | cpython-cd2a6033ac0bafd69a7cba2d132e092127acc895.zip cpython-cd2a6033ac0bafd69a7cba2d132e092127acc895.tar.gz cpython-cd2a6033ac0bafd69a7cba2d132e092127acc895.tar.bz2 |
Branch merge
Diffstat (limited to 'Lib/shutil.py')
-rw-r--r-- | Lib/shutil.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index 00bffe5..d1b1af3 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -493,7 +493,6 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None): _ARCHIVE_FORMATS = { 'gztar': (_make_tarball, [('compress', 'gzip')], "gzip'ed tar-file"), - 'bztar': (_make_tarball, [('compress', 'bzip2')], "bzip2'ed tar-file"), 'tar': (_make_tarball, [('compress', None)], "uncompressed tar file"), 'zip': (_make_zipfile, [],"ZIP file") } |