diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-23 15:58:10 +0300 |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-23 15:58:10 +0300 |
commit | 39891fff32eabf79c02073ad0203df20b3f5b908 (patch) | |
tree | d8645b8e423060587a50cc6d3b4d20f3ee60b544 /Lib/shutil.py | |
parent | 2fbc019c8cd3b61b9c2651952ebb187df60d8266 (diff) | |
parent | 7fc92bb38a47f7da044847f8112e17201abf79bd (diff) | |
download | cpython-git-39891fff32eabf79c02073ad0203df20b3f5b908.tar.gz |
Issue #28488: shutil.make_archive() no longer adds entry "./" to ZIP archive.
Diffstat (limited to 'Lib/shutil.py')
-rw-r--r-- | Lib/shutil.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index 9d193b567c..90b71986a9 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -680,9 +680,10 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None): with zipfile.ZipFile(zip_filename, "w", compression=zipfile.ZIP_DEFLATED) as zf: path = os.path.normpath(base_dir) - zf.write(path, path) - if logger is not None: - logger.info("adding '%s'", path) + if path != os.curdir: + zf.write(path, path) + if logger is not None: + logger.info("adding '%s'", path) for dirpath, dirnames, filenames in os.walk(base_dir): for name in sorted(dirnames): path = os.path.normpath(os.path.join(dirpath, name)) |