Commit6de8e67

committed

Refactor current fix for symlink-following bug

This keeps the same approach, but expresses it better. This doesnot update the tests (yet), so one test is still failing.

1 parentfd78a53 commit6de8e67Copy full SHA for 6de8e67

File tree

-13

lines changed

-13

lines changed

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ def patch_env(name: str, value: str) -> Generator[None, None, None]:`
`197`	`197`	`os.environ[name]=old_value`
`198`	`198`
`199`	`199`
`200`		`-def_rmtree_windows(path:PathLike)->None:`
	`200`	`+defrmtree(path:PathLike)->None:`
`201`	`201`	`"""Remove the given directory tree recursively.`
`202`	`202`
`203`	`203`	:note: We use :func:`shutil.rmtree` but adjust its behaviour to see whether files
`@@ -219,23 +219,14 @@ def handler(function: Callable, path: PathLike, _excinfo: Any) -> None:`
`219`	`219`	`raiseSkipTest(f"FIXME: fails with: PermissionError\n{ex}")fromex`
`220`	`220`	`raise`
`221`	`221`
`222`		`-ifsys.version_info>= (3,12):`
	`222`	`+ifos.name!="nt":`
	`223`	`+shutil.rmtree(path)`
	`224`	`+elifsys.version_info>= (3,12):`
`223`	`225`	`shutil.rmtree(path,onexc=handler)`
`224`	`226`	`else:`
`225`	`227`	`shutil.rmtree(path,onerror=handler)`
`226`	`228`
`227`	`229`
`228`		`-def_rmtree_posix(path:PathLike)->None:`
`229`		`-"""Remove the given directory tree recursively."""`
`230`		`-returnshutil.rmtree(path)`
`231`		`-`
`232`		`-`
`233`		`-ifos.name=="nt":`
`234`		`-rmtree=_rmtree_windows`
`235`		`-else:`
`236`		`-rmtree=_rmtree_posix`
`237`		`-`
`238`		`-`
`239`	`230`	`defrmfile(path:PathLike)->None:`
`240`	`231`	`"""Ensure file deleted also on Windows where read-only files need special treatment."""`
`241`	`232`	`ifosp.isfile(path):`

Comments

(0)