Handle NotADirectoryError in shutil._rmtree_unsafe and pathlib.Path.walk when os.walk raises early

Author: Aniketsy

Lib/pathlib/__init__.py

@@ -1086,11 +1086,17 @@ def walk(self, top_down=True, on_error=None, follow_symlinks=False):
         root_dir = str(self)
         if not follow_symlinks:
             follow_symlinks = os._walk_symlinks_as_files
-        results = os.walk(root_dir, top_down, on_error, follow_symlinks)
-        for path_str, dirnames, filenames in results:
-            if root_dir == '.':
-                path_str = path_str[2:]
-            yield self._from_parsed_string(path_str), dirnames, filenames
+        try:
+            results = os.walk(root_dir, top_down, on_error, follow_symlinks)
+            for path_str, dirnames, filenames in results:
+                if root_dir == '.':
+                    path_str = path_str[2:]
+                yield self._from_parsed_string(path_str), dirnames, filenames
+        except OSError as err:
+            if on_error is not None:
+                on_error(err)
+            else:
+                raise
 
     def absolute(self):
         """Return an absolute version of this path

Lib/shutil.py

@@ -685,24 +685,27 @@ def _rmtree_unsafe(path, dir_fd, onexc):
     def onerror(err):
         if not isinstance(err, FileNotFoundError):
             onexc(os.scandir, err.filename, err)
-    results = os.walk(path, topdown=False, onerror=onerror, followlinks=os._walk_symlinks_as_files)
-    for dirpath, dirnames, filenames in results:
-        for name in dirnames:
-            fullname = os.path.join(dirpath, name)
-            try:
-                os.rmdir(fullname)
-            except FileNotFoundError:
-                continue
-            except OSError as err:
-                onexc(os.rmdir, fullname, err)
-        for name in filenames:
-            fullname = os.path.join(dirpath, name)
-            try:
-                os.unlink(fullname)
-            except FileNotFoundError:
-                continue
-            except OSError as err:
-                onexc(os.unlink, fullname, err)
+    try:
+        results = os.walk(path, topdown=False, onerror=onerror, followlinks=os._walk_symlinks_as_files)
+        for dirpath, dirnames, filenames in results:
+            for name in dirnames:
+                fullname = os.path.join(dirpath, name)
+                try:
+                    os.rmdir(fullname)
+                except FileNotFoundError:
+                    continue
+                except OSError as err:
+                    onexc(os.rmdir, fullname, err)
+            for name in filenames:
+                fullname = os.path.join(dirpath, name)
+                try:
+                    os.unlink(fullname)
+                except FileNotFoundError:
+                    continue
+                except OSError as err:
+                    onexc(os.unlink, fullname, err)
+    except OSError as err:
+        onexc(os.walk, path, err)
     try:
         os.rmdir(path)
     except FileNotFoundError: