(original) (raw)

changeset: 88902:20aa07f93ca7 parent: 88899:558b26b6a342 parent: 88901:838674d15b5b user: Benjamin Peterson benjamin@python.org date: Sun Feb 02 15:31:07 2014 -0500 files: Lib/shutil.py description: merge 3.3 (#20102) diff -r 558b26b6a342 -r 20aa07f93ca7 Lib/shutil.py --- a/Lib/shutil.py Sun Feb 02 12:50:48 2014 -0500 +++ b/Lib/shutil.py Sun Feb 02 15:31:07 2014 -0500 @@ -679,17 +679,15 @@ zip_filename, base_dir) if not dry_run: - zip = zipfile.ZipFile(zip_filename, "w", - compression=zipfile.ZIP_DEFLATED) - - for dirpath, dirnames, filenames in os.walk(base_dir): - for name in filenames: - path = os.path.normpath(os.path.join(dirpath, name)) - if os.path.isfile(path): - zip.write(path, path) - if logger is not None: - logger.info("adding '%s'", path) - zip.close() + with zipfile.ZipFile(zip_filename, "w", + compression=zipfile.ZIP_DEFLATED) as zf: + for dirpath, dirnames, filenames in os.walk(base_dir): + for name in filenames: + path = os.path.normpath(os.path.join(dirpath, name)) + if os.path.isfile(path): + zf.write(path, path) + if logger is not None: + logger.info("adding '%s'", path) return zip_filename /benjamin@python.org