[3.11] pythongh-79325: Fix recursion error in TemporaryDirectory clea…

…nup on Windows (pythonGH-112762)

(cherry picked from commit b2923a6)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Lib/tempfile.py

@@ -876,9 +876,14 @@ def __init__(self, suffix=None, prefix=None, dir=None,
  ignore_errors=self._ignore_cleanup_errors)
 
  @classmethod
- def _rmtree(cls, name, ignore_errors=False):
+ def _rmtree(cls, name, ignore_errors=False, repeated=False):
  def onerror(func, path, exc_info):
  if issubclass(exc_info[0], PermissionError):
+ if repeated and path == name:
+ if ignore_errors:
+ return
+ raise
+
  try:
  if path != name:
  _resetperms(_os.path.dirname(path))
@@ -911,7 +916,8 @@ def onerror(func, path, exc_info):
  if ignore_errors:
  return
  raise
- cls._rmtree(path, ignore_errors=ignore_errors)
+ cls._rmtree(path, ignore_errors=ignore_errors,
+ repeated=(path == name))
  except FileNotFoundError:
  pass
  elif issubclass(exc_info[0], FileNotFoundError):

Lib/test/test_tempfile.py

@@ -1543,6 +1543,17 @@ def test_explicit_cleanup_correct_error(self):
  with self.assertRaises(PermissionError):
  temp_dir.cleanup()
 
+ @unittest.skipUnless(os.name == "nt", "Only on Windows.")
+ def test_cleanup_with_used_directory(self):
+ with tempfile.TemporaryDirectory() as working_dir:
+ temp_dir = self.do_create(dir=working_dir)
+ subdir = os.path.join(temp_dir.name, "subdir")
+ os.mkdir(subdir)
+ with os_helper.change_cwd(subdir):
+ # Previously raised RecursionError on some OSes
+ # (e.g. Windows). See bpo-35144.
+ with self.assertRaises(PermissionError):
+ temp_dir.cleanup()
 
  @os_helper.skip_unless_symlink
  def test_cleanup_with_symlink_to_a_directory(self):

Misc/NEWS.d/next/Library/2023-12-05-18-57-53.gh-issue-79325.P2vMVK.rst

@@ -0,0 +1,2 @@
+Fix an infinite recursion error in :func:`tempfile.TemporaryDirectory`
+cleanup on Windows.