Merge pull request #3194 from pre-commit/handle-readonly-3-12

adjust _handle_readonly for typeshed updates
This commit is contained in:
Anthony Sottile 2024-04-29 21:36:47 -04:00 committed by GitHub
commit d7e21cd29c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions

View file

@ -205,10 +205,11 @@ else: # pragma: no cover
def _handle_readonly(
func: Callable[[str], object],
path: str,
exc: OSError,
exc: Exception,
) -> None:
if (
func in (os.rmdir, os.remove, os.unlink) and
isinstance(exc, OSError) and
exc.errno in {errno.EACCES, errno.EPERM}
):
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(
func: Callable[[str], object],
path: str,
excinfo: tuple[type[OSError], OSError, TracebackType],
excinfo: tuple[type[Exception], Exception, TracebackType],
) -> None:
return _handle_readonly(func, path, excinfo[1])

View file

@ -91,8 +91,8 @@ def test_ruby_additional_deps(tmp_path):
tmp_path,
ruby,
'ruby -e',
args=('require "tins"',),
deps=('tins',),
args=('require "jmespath"',),
deps=('jmespath',),
)
assert ret == (0, b'')