diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-02-05 12:49:59 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-02-05 12:49:59 (GMT) |
| commit | cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2 (patch) | |
| tree | 3e40b36621bfc2f4140b612d8a6d2ed01d1f9e39 /Lib/shutil.py | |
| parent | be095b3b9857a5b949dd23b89dac5f5151b252d5 (diff) | |
| parent | cd2a6033ac0bafd69a7cba2d132e092127acc895 (diff) | |
| download | cpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.zip cpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.tar.gz cpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.tar.bz2 | |
Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715)
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 5f69fb7..db80faf 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -552,7 +552,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") } |