Really make bztar support in shutil conditional.

merwok · merwok · commit 89dfd5cf8096 · 2012-02-05T13:40:08.000+01:00
This dict entry is added a few lines after if the bzip2 module is
available, but removing this line was forgotten.
diff --git 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")
     }

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,6 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None):`
`493`	`493`
`494`	`494`	`_ARCHIVE_FORMATS = {`
`495`	`495`	`'gztar': (_make_tarball, [('compress', 'gzip')], "gzip'ed tar-file"),`
`496`		`- 'bztar': (_make_tarball, [('compress', 'bzip2')], "bzip2'ed tar-file"),`
`497`	`496`	`'tar': (_make_tarball, [('compress', None)], "uncompressed tar file"),`
`498`	`497`	`'zip': (_make_zipfile, [],"ZIP file")`
`499`	`498`	`}`