bpo-35332: shutil.rmtree(ignore_errors=True) doesn't handle os.close()

When *ignore_errors* is True, the shutil.rmtree() function now
ignores errors when calling os.close().

Lib/shutil.py

@@ -667,7 +667,10 @@ def _rmtree_safe_fd(topfd, path, onerror):
                         except OSError:
                             onerror(os.path.islink, fullname, sys.exc_info())
                 finally:
-                    os.close(dirfd)
+                    try:
+                        os.close(dirfd)
+                    except OSError:
+                        onerror(os.close, fullname, sys.exc_info())
         else:
             try:
                 os.unlink(entry.name, dir_fd=topfd)
@@ -727,7 +730,10 @@ def rmtree(path, ignore_errors=False, onerror=None):
                 except OSError:
                     onerror(os.path.islink, path, sys.exc_info())
         finally:
-            os.close(fd)
+            try:
+                os.close(fd)
+            except OSError:
+                onerror(os.close, path, sys.exc_info())
     else:
         try:
             if _rmtree_islink(path):

Misc/NEWS.d/next/Library/2020-12-14-09-31-13.bpo-35332.s22wAx.rst

@@ -0,0 +1,2 @@
+The :func:`shutil.rmtree` function now ignores errors when calling
+:func:`os.close` when *ignore_errors* is ``True``.