diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-23 12:57:42 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-23 12:57:42 (GMT) |
| commit | 7fc92bb38a47f7da044847f8112e17201abf79bd (patch) | |
| tree | cc6777e41b84afedcd4636c4a6046199a603dc69 /Lib/shutil.py | |
| parent | 89ecb4ac1046397ae0fc09676adf90ef7a72ea95 (diff) | |
| parent | 666de7772708047b63125126b0147931571254a4 (diff) | |
| download | cpython-7fc92bb38a47f7da044847f8112e17201abf79bd.zip cpython-7fc92bb38a47f7da044847f8112e17201abf79bd.tar.gz cpython-7fc92bb38a47f7da044847f8112e17201abf79bd.tar.bz2 | |
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 9d193b5..90b7198 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)) |