Issue #24120: Ignore PermissionError in pathlib.Path.[r]glob(). Ulrich Petri. (Merge 3.5->3.6)

Lib/pathlib.py

@@ -499,12 +499,15 @@ class _PreciseSelector(_Selector):
         _Selector.__init__(self, child_parts)
 
     def _select_from(self, parent_path, is_dir, exists, listdir):
+        try:
             if not is_dir(parent_path):
                 return
             path = parent_path._make_child_relpath(self.name)
             if exists(path):
                 for p in self.successor._select_from(path, is_dir, exists, listdir):
                     yield p
+        except PermissionError:
+            return
 
 
 class _WildcardSelector(_Selector):
@@ -514,6 +517,7 @@ class _WildcardSelector(_Selector):
         _Selector.__init__(self, child_parts)
 
     def _select_from(self, parent_path, is_dir, exists, listdir):
+        try:
             if not is_dir(parent_path):
                 return
             cf = parent_path._flavour.casefold
@@ -523,6 +527,9 @@ class _WildcardSelector(_Selector):
                     path = parent_path._make_child_relpath(name)
                     for p in self.successor._select_from(path, is_dir, exists, listdir):
                         yield p
+        except PermissionError:
+            return
+
 
 
 class _RecursiveWildcardSelector(_Selector):
@@ -539,6 +546,7 @@ class _RecursiveWildcardSelector(_Selector):
                     yield p
 
     def _select_from(self, parent_path, is_dir, exists, listdir):
+        try:
             if not is_dir(parent_path):
                 return
             with _cached(listdir) as listdir:
@@ -552,6 +560,8 @@ class _RecursiveWildcardSelector(_Selector):
                                 yielded.add(p)
                 finally:
                     yielded.clear()
+        except PermissionError:
+            return
 
 
 #

Lib/test/test_pathlib.py

@@ -1199,26 +1199,33 @@ class _BasePathTest(object):
 
     # (BASE)
     #  |
-    #  |-- dirA/
-    #       |-- linkC -> "../dirB"
-    #  |-- dirB/
+    #  |-- brokenLink -> non-existing
+    #  |-- dirA
+    #  |   `-- linkC -> ../dirB
+    #  |-- dirB
     #  |   |-- fileB
-    #       |-- linkD -> "../dirB"
-    #  |-- dirC/
-    #  |    |-- fileC
-    #  |    |-- fileD
+    #  |   `-- linkD -> ../dirB
+    #  |-- dirC
+    #  |   |-- dirD
+    #  |   |   `-- fileD
+    #  |   `-- fileC
+    #  |-- dirE
     #  |-- fileA
-    #  |-- linkA -> "fileA"
-    #  |-- linkB -> "dirB"
+    #  |-- linkA -> fileA
+    #  `-- linkB -> dirB
     #
 
     def setUp(self):
+        def cleanup():
+            os.chmod(join('dirE'), 0o777)
+            support.rmtree(BASE)
+        self.addCleanup(cleanup)
         os.mkdir(BASE)
-        self.addCleanup(support.rmtree, BASE)
         os.mkdir(join('dirA'))
         os.mkdir(join('dirB'))
         os.mkdir(join('dirC'))
         os.mkdir(join('dirC', 'dirD'))
+        os.mkdir(join('dirE'))
         with open(join('fileA'), 'wb') as f:
             f.write(b"this is file A\n")
         with open(join('dirB', 'fileB'), 'wb') as f:
@@ -1227,6 +1234,7 @@ class _BasePathTest(object):
             f.write(b"this is file C\n")
         with open(join('dirC', 'dirD', 'fileD'), 'wb') as f:
             f.write(b"this is file D\n")
+        os.chmod(join('dirE'), 0)
         if not symlink_skip_reason:
             # Relative symlinks
             os.symlink('fileA', join('linkA'))
@@ -1363,7 +1371,7 @@ class _BasePathTest(object):
         p = P(BASE)
         it = p.iterdir()
         paths = set(it)
-        expected = ['dirA', 'dirB', 'dirC', 'fileA']
+        expected = ['dirA', 'dirB', 'dirC', 'dirE', 'fileA']
         if not symlink_skip_reason:
             expected += ['linkA', 'linkB', 'brokenLink']
         self.assertEqual(paths, { P(BASE, q) for q in expected })

Misc/ACKS

@@ -1110,6 +1110,7 @@ Gabriel de Perthuis
 Tim Peters
 Benjamin Peterson
 Joe Peterson
+Ulrich Petri
 Chris Petrilli
 Roumen Petrov
 Bjorn Pettersen

Misc/NEWS

@@ -128,6 +128,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #24120: Ignore PermissionError when traversing a tree with
+  pathlib.Path.[r]glob().  Patch by Ulrich Petri.
+
 - Issue #21815: Accept ] characters in the data portion of imap responses,
   in order to handle the flags with square brackets accepted and produced
   by servers such as gmail.