adjust _handle_readonly for typeshed updates

This commit is contained in:
Anthony Sottile 2024-04-29 21:05:41 -04:00
parent 85fe18253f
commit 0d4c6da36e

View file

@ -205,10 +205,11 @@ else: # pragma: no cover
def _handle_readonly( def _handle_readonly(
func: Callable[[str], object], func: Callable[[str], object],
path: str, path: str,
exc: OSError, exc: Exception,
) -> None: ) -> None:
if ( if (
func in (os.rmdir, os.remove, os.unlink) and func in (os.rmdir, os.remove, os.unlink) and
isinstance(exc, OSError) and
exc.errno in {errno.EACCES, errno.EPERM} exc.errno in {errno.EACCES, errno.EPERM}
): ):
for p in (path, os.path.dirname(path)): for p in (path, os.path.dirname(path)):
@ -222,7 +223,7 @@ if sys.version_info < (3, 12): # pragma: <3.12 cover
def _handle_readonly_old( def _handle_readonly_old(
func: Callable[[str], object], func: Callable[[str], object],
path: str, path: str,
excinfo: tuple[type[OSError], OSError, TracebackType], excinfo: tuple[type[Exception], Exception, TracebackType],
) -> None: ) -> None:
return _handle_readonly(func, path, excinfo[1]) return _handle_readonly(func, path, excinfo[1])