diff options
| author | Guido van Rossum <guido@python.org> | 2016-01-07 18:56:36 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2016-01-07 18:56:36 (GMT) |
| commit | bc9fddaf50df55f1b4d11ecb5598b95adacac707 (patch) | |
| tree | 51062a47247af062331235be329a1ed1be223f3d | |
| parent | f3695bfacfa51e0e8fb47c7e406152a3f9cd3af2 (diff) | |
| download | cpython-bc9fddaf50df55f1b4d11ecb5598b95adacac707.zip cpython-bc9fddaf50df55f1b4d11ecb5598b95adacac707.tar.gz cpython-bc9fddaf50df55f1b4d11ecb5598b95adacac707.tar.bz2 | |
Add another try/except PermissionError to avoid depending on listdir order. Fix issues #24120 and #26012.
| -rw-r--r-- | Lib/pathlib.py | 13 | ||||
| -rw-r--r-- | Lib/test/test_pathlib.py | 16 |
2 files changed, 16 insertions, 13 deletions
diff --git a/Lib/pathlib.py b/Lib/pathlib.py index 1bd457a..8fef259 100644 --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -494,11 +494,14 @@ class _RecursiveWildcardSelector(_Selector): def _iterate_directories(self, parent_path, is_dir, listdir): yield parent_path - for name in listdir(parent_path): - path = parent_path._make_child_relpath(name) - if is_dir(path) and not path.is_symlink(): - for p in self._iterate_directories(path, is_dir, listdir): - yield p + try: + for name in listdir(parent_path): + path = parent_path._make_child_relpath(name) + if is_dir(path) and not path.is_symlink(): + for p in self._iterate_directories(path, is_dir, listdir): + yield p + except PermissionError: + return def _select_from(self, parent_path, is_dir, exists, listdir): try: diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index 061c764..a12af22 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -1240,7 +1240,7 @@ class _BasePathTest(object): # | |-- dirD # | | `-- fileD # | `-- fileC - # |-- dirE + # |-- dirE # No permissions # |-- fileA # |-- linkA -> fileA # `-- linkB -> dirB @@ -1396,13 +1396,13 @@ class _BasePathTest(object): p = P(BASE) it = p.rglob("fileA") self.assertIsInstance(it, collections.Iterator) - # XXX cannot test because of symlink loops in the test setup - #_check(it, ["fileA"]) - #_check(p.rglob("fileB"), ["dirB/fileB"]) - #_check(p.rglob("*/fileA"), [""]) - #_check(p.rglob("*/fileB"), ["dirB/fileB"]) - #_check(p.rglob("file*"), ["fileA", "dirB/fileB"]) - # No symlink loops here + _check(it, ["fileA"]) + _check(p.rglob("fileB"), ["dirB/fileB"]) + _check(p.rglob("*/fileA"), []) + _check(p.rglob("*/fileB"), ["dirB/fileB", "dirB/linkD/fileB", + "linkB/fileB", "dirA/linkC/fileB"]) + _check(p.rglob("file*"), ["fileA", "dirB/fileB", + "dirC/fileC", "dirC/dirD/fileD"]) p = P(BASE, "dirC") _check(p.rglob("file*"), ["dirC/fileC", "dirC/dirD/fileD"]) _check(p.rglob("*/*"), ["dirC/dirD/fileD"]) |