diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-23 15:55:09 +0300 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-23 15:55:09 +0300 |
| commit | 666de7772708047b63125126b0147931571254a4 (patch) | |
| tree | 8ceb8d7dcc07c82d982072b5757e5405018ea980 | |
| parent | 61c4c44b2a821740c78964398a3469ad10bd03ad (diff) | |
| download | cpython-git-666de7772708047b63125126b0147931571254a4.tar.gz | |
Issue #28488: shutil.make_archive() no longer adds entry "./" to ZIP archive.
| -rw-r--r-- | Lib/shutil.py | 7 | ||||
| -rw-r--r-- | Lib/test/test_shutil.py | 13 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 19 insertions, 3 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index dc9f2ebc00..6cf88d9fac 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)) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 1d5e01a92d..1e65a2a471 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1068,6 +1068,19 @@ class TestShutil(unittest.TestCase): 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.assertCountEqual(zf.namelist(), + ['dist/', 'dist/sub/', 'dist/sub2/', + 'dist/file1', 'dist/file2', 'dist/sub/file3', + '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) self.assertEqual(res, base_name + '.zip') @@ -110,6 +110,8 @@ Core and Builtins Library ------- +- Issue #28488: shutil.make_archive() no longer add entry "./" to ZIP archive. + - Issue #24452: Make webbrowser support Chrome on Mac OS X. - Issue #20766: Fix references leaked by pdb in the handling of SIGINT |