mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715)

Browse source
This commit is contained in:
Éric Araujo 2012-02-05 13:49:59 +01:00
commit cd0d951a70
15 changed files with 56 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/shutil.py
View file

@ -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")
}