Merge branch 'main' into gh-77609-glob-follow-symlinks

python · barneygale · May 29, 2023 · Mar 12, 2023 · Mar 12, 2023 · Mar 12, 2023
commit 6c61822c9c5ea7c14bacf37d8776482a62f64ada
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
@@ -149,9 +149,6 @@ def _select_from(self, parent_path, scandir, follow_symlinks):
             for entry in entries:
                 if self.dironly:
                     try:
-                        # "entry.is_dir()" can raise PermissionError
-                        # in some cases (see bpo-38894), which is not
-                        # among the errors ignored by _ignore_error()
                         if not entry.is_dir(follow_symlinks=follow_dirlinks):
                             continue
                     except OSError:
@@ -182,23 +179,19 @@ def _iterate_directories(self, parent_path, scandir, follow_symlinks):
                 entry_is_dir = False
                 try:
                     entry_is_dir = entry.is_dir(follow_symlinks=follow_symlinks)
-                except OSError as e:
-                    if not _ignore_error(e):
-                        raise
+                except OSError:
+                    pass
                 if entry_is_dir:
                     path = parent_path._make_child_relpath(entry.name)
                     for p in self._iterate_directories(path, scandir, follow_symlinks):
                         yield p
 
     def _select_from(self, parent_path, scandir, follow_symlinks):
         follow_dirlinks = False if follow_symlinks is None else follow_symlinks
-        try:
-            successor_select = self.successor._select_from
-            for starting_point in self._iterate_directories(parent_path, scandir, follow_dirlinks):
-                for p in successor_select(starting_point, scandir, follow_symlinks):
-                    yield p
-        except PermissionError:
-            return
+        successor_select = self.successor._select_from
+        for starting_point in self._iterate_directories(parent_path, scandir, follow_dirlinks):
+            for p in successor_select(starting_point, scandir, follow_symlinks):
+                yield p
 
 
 class _DoubleRecursiveWildcardSelector(_RecursiveWildcardSelector):