From ef5c24a72e16394d0d78e3bef742101218a1bd22 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sun, 23 Oct 2016 15:52:01 +0300 Subject: [PATCH] Issue #28488: shutil.make_archive() no longer adds entry "./" to ZIP archive. --- Lib/shutil.py | 7 ++++--- Lib/test/test_shutil.py | 13 +++++++++++++ Misc/NEWS | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Lib/shutil.py b/Lib/shutil.py index 26dcfde7bc..388906fd43 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -450,9 +450,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)) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index c85f25e1bc..0869a9e553 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -473,6 +473,19 @@ class TestShutil(unittest.TestCase): work_dir = os.path.dirname(tmpdir2) rel_base_name = os.path.join(os.path.basename(tmpdir2), 'archive') + with support.change_cwd(work_dir): + base_name = os.path.abspath(rel_base_name) + res = make_archive(rel_base_name, 'zip', root_dir) + + self.assertEqual(res, base_name + '.zip') + self.assertTrue(os.path.isfile(res)) + self.assertTrue(zipfile.is_zipfile(res)) + with zipfile.ZipFile(res) as zf: + self.assertEqual(sorted(zf.namelist()), + ['dist/', 'dist/file1', 'dist/file2', + 'dist/sub/', 'dist/sub/file3', 'dist/sub2/', + 'outer']) + with support.change_cwd(work_dir): base_name = os.path.abspath(rel_base_name) res = make_archive(rel_base_name, 'zip', root_dir, base_dir) diff --git a/Misc/NEWS b/Misc/NEWS index 6cf59a31bc..dfe93e3c60 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -60,6 +60,8 @@ Core and Builtins Library ------- +- Issue #28488: shutil.make_archive() no longer adds entry "./" to ZIP archive. + - Issue #28480: Fix error building _sqlite3 module when multithreading is disabled. -- 2.50.1