diff options
| author | Bruno P. Kinoshita <kinow@users.noreply.github.com> | 2019-11-27 01:10:37 (GMT) |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-11-27 01:10:37 (GMT) |
| commit | 9bbcbc9f6dfe1368fe7330b117707f828e6a2c18 (patch) | |
| tree | 8a4c4de3fd1e0f90885006c6b26c51bb3ad0df3c /Lib | |
| parent | c7c01ab1e5415b772c68e15f1aba51e520010830 (diff) | |
| download | cpython-9bbcbc9f6dfe1368fe7330b117707f828e6a2c18.zip cpython-9bbcbc9f6dfe1368fe7330b117707f828e6a2c18.tar.gz cpython-9bbcbc9f6dfe1368fe7330b117707f828e6a2c18.tar.bz2 | |
bpo-38688, shutil.copytree: consume iterator and create list of entries to prevent infinite recursion (GH-17098)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/shutil.py | 13 | ||||
| -rw-r--r-- | Lib/test/test_shutil.py | 11 |
2 files changed, 18 insertions, 6 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index f97de78..8f609b3 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -442,7 +442,7 @@ def ignore_patterns(*patterns): def _copytree(entries, src, dst, symlinks, ignore, copy_function, ignore_dangling_symlinks, dirs_exist_ok=False): if ignore is not None: - ignored_names = ignore(src, set(os.listdir(src))) + ignored_names = ignore(src, {x.name for x in entries}) else: ignored_names = set() @@ -543,11 +543,12 @@ def copytree(src, dst, symlinks=False, ignore=None, copy_function=copy2, """ sys.audit("shutil.copytree", src, dst) - with os.scandir(src) as entries: - return _copytree(entries=entries, src=src, dst=dst, symlinks=symlinks, - ignore=ignore, copy_function=copy_function, - ignore_dangling_symlinks=ignore_dangling_symlinks, - dirs_exist_ok=dirs_exist_ok) + with os.scandir(src) as itr: + entries = list(itr) + return _copytree(entries=entries, src=src, dst=dst, symlinks=symlinks, + ignore=ignore, copy_function=copy_function, + ignore_dangling_symlinks=ignore_dangling_symlinks, + dirs_exist_ok=dirs_exist_ok) if hasattr(os.stat_result, 'st_file_attributes'): # Special handling for directory junctions to make them behave like diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index dd5589b..460b979 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -727,6 +727,17 @@ class TestCopyTree(BaseTest, unittest.TestCase): rv = shutil.copytree(src_dir, dst_dir) self.assertEqual(['foo'], os.listdir(rv)) + def test_copytree_subdirectory(self): + # copytree where dst is a subdirectory of src, see Issue 38688 + base_dir = self.mkdtemp() + self.addCleanup(shutil.rmtree, base_dir, ignore_errors=True) + src_dir = os.path.join(base_dir, "t", "pg") + dst_dir = os.path.join(src_dir, "somevendor", "1.0") + os.makedirs(src_dir) + src = os.path.join(src_dir, 'pol') + write_file(src, 'pol') + rv = shutil.copytree(src_dir, dst_dir) + self.assertEqual(['pol'], os.listdir(rv)) class TestCopy(BaseTest, unittest.TestCase): |