diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-11-27 22:48:46 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-11-27 22:48:46 (GMT) |
| commit | 9a4fc19589a080d8e21ade8d64034b78d500b004 (patch) | |
| tree | e09882b00d2c4dd6276ab269d5f7a727a6758c06 | |
| parent | ab5e9b9213558d00ef8405d89e4cb103795972e3 (diff) | |
| download | cpython-9a4fc19589a080d8e21ade8d64034b78d500b004.zip cpython-9a4fc19589a080d8e21ade8d64034b78d500b004.tar.gz cpython-9a4fc19589a080d8e21ade8d64034b78d500b004.tar.bz2 | |
Issue #21280: Fixed a bug in shutil.make_archive() when create an archive of
current directory in current directory.
| -rw-r--r-- | Lib/shutil.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_shutil.py | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index b5e7cbe..22958f4 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -600,7 +600,7 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0, archive_name = base_name + '.tar' + compress_ext.get(compress, '') archive_dir = os.path.dirname(archive_name) - if not os.path.exists(archive_dir): + if archive_dir and not os.path.exists(archive_dir): if logger is not None: logger.info("creating %s", archive_dir) if not dry_run: @@ -660,7 +660,7 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None): zip_filename = base_name + ".zip" archive_dir = os.path.dirname(base_name) - if not os.path.exists(archive_dir): + if archive_dir and not os.path.exists(archive_dir): if logger is not None: logger.info("creating %s", archive_dir) if not dry_run: diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index c4306da..3490362 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -1126,6 +1126,21 @@ class TestShutil(unittest.TestCase): finally: unregister_archive_format('xxx') + def test_make_tarfile_in_curdir(self): + # Issue #21280 + root_dir = self.mkdtemp() + with support.change_cwd(root_dir): + self.assertEqual(make_archive('test', 'tar'), 'test.tar') + self.assertTrue(os.path.isfile('test.tar')) + + @requires_zlib + def test_make_zipfile_in_curdir(self): + # Issue #21280 + root_dir = self.mkdtemp() + with support.change_cwd(root_dir): + self.assertEqual(make_archive('test', 'zip'), 'test.zip') + self.assertTrue(os.path.isfile('test.zip')) + def test_register_archive_format(self): self.assertRaises(TypeError, register_archive_format, 'xxx', 1) |