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 | |
| parent | 2fbc019c8cd3b61b9c2651952ebb187df60d8266 (diff) | |
| parent | 7fc92bb38a47f7da044847f8112e17201abf79bd (diff) | |
| download | cpython-git-39891fff32eabf79c02073ad0203df20b3f5b908.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 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)) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 990fae55db..d93efb8867 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1066,6 +1066,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') @@ -16,6 +16,8 @@ Core and Builtins - Issue #23782: Fixed possible memory leak in _PyTraceback_Add() and exception loss in PyTraceBack_Here(). +- Issue #28488: shutil.make_archive() no longer adds entry "./" to ZIP archive. + - Issue #25953: re.sub() now raises an error for invalid numerical group reference in replacement template even if the pattern is not found in the string. Error message for invalid group reference now includes the |