diff options
| -rw-r--r-- | Lib/pathlib.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_pathlib.py | 19 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/Lib/pathlib.py b/Lib/pathlib.py index b3303b6..cab4151 100644 --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -496,7 +496,7 @@ class _RecursiveWildcardSelector(_Selector): yield parent_path for name in listdir(parent_path): path = parent_path._make_child_relpath(name) - if is_dir(path): + if is_dir(path) and not path.is_symlink(): for p in self._iterate_directories(path, is_dir, listdir): yield p diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index d272264..f91cda0 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -1245,7 +1245,7 @@ class _BasePathTest(object): os.symlink('non-existing', join('brokenLink')) self.dirlink('dirB', join('linkB')) self.dirlink(os.path.join('..', 'dirB'), join('dirA', 'linkC')) - # This one goes upwards but doesn't create a loop + # This one goes upwards, creating a loop self.dirlink(os.path.join('..', 'dirB'), join('dirB', 'linkD')) if os.name == 'nt': @@ -1380,6 +1380,23 @@ class _BasePathTest(object): _check(p.rglob("file*"), ["dirC/fileC", "dirC/dirD/fileD"]) _check(p.rglob("*/*"), ["dirC/dirD/fileD"]) + @with_symlinks + def test_rglob_symlink_loop(self): + # Don't get fooled by symlink loops (Issue #26012) + P = self.cls + p = P(BASE) + given = set(p.rglob('*')) + expect = {'brokenLink', + 'dirA', 'dirA/linkC', + 'dirB', 'dirB/fileB', 'dirB/linkD', + 'dirC', 'dirC/dirD', 'dirC/dirD/fileD', 'dirC/fileC', + 'dirE', + 'fileA', + 'linkA', + 'linkB', + } + self.assertEqual(given, {p / x for x in expect}) + def test_glob_dotdot(self): # ".." is not special in globs P = self.cls @@ -13,6 +13,9 @@ Core and Builtins Library ------- +- Issue #26012: Don't traverse into symlinks for ** pattern in + pathlib.Path.[r]glob(). + - Issue #24120: Ignore PermissionError when traversing a tree with pathlib.Path.[r]glob(). Patch by Ulrich Petri. |