summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-02-05 13:40:08 +0100
committerÉric Araujo <merwok@netwok.org>2012-02-05 13:40:08 +0100
commit01da7807f2f51c75b1c5b8171e824a6993214105 (patch)
tree37c9e77bce4b015f9b54fd89b8c051064678b457
parent75d05fe34ab03d32c6ecc404e5de2d6b1fafacc4 (diff)
downloadcpython-01da7807f2f51c75b1c5b8171e824a6993214105.tar.gz
Really make bztar support in shutil conditional.
This dict entry is added a few lines after if the bzip2 module is available, but removing this line was forgotten.
-rw-r--r--Lib/shutil.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py
index 00bffe5f20..d1b1af3246 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")
}