Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/utils/resourceutil.py @ 52665:24ee91ba9aa8
pyupgrade: drop usage of py3 aliases for `OSError`
These were different classes in py2, but now a handful of error classes are just
an alias of `OSError`, like `IOError`, `EnvironmentError`, `WindowsError`, etc.
This is the result of running a hacked version of `pyupgrade` 3.19.1[1]
$ hg files -0 'relglob:**.py' | xargs -0 \
pyupgrade --py38-plus --keep-percent-format --keep-mock --keep-runtime-typing
The hack is because it doesn't have command line switches to disable most
changes, so it makes tons of unrelated changes all at once. The hack is to
1) patch `pyupgrade._main._fix_tokens()` to immediately return its content arg
2) change `pyupgrade._data.register_decorator()` to only register the function
if it's from the fixer we're interested in:
if func.__module__ in (
"pyupgrade._plugins.exceptions",
):
FUNCS[tp].append(func)
return func
[1] https://github.com/asottile/pyupgrade
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 05 Jan 2025 21:03:17 -0500 |
parents | b2e90465daf6 |
children | 4cb75772818d |
comparison
equal
deleted
inserted
replaced
52664:9db77d46de79 | 52665:24ee91ba9aa8 |
---|---|
93 def is_resource(package: bytes, name: bytes) -> bool: | 93 def is_resource(package: bytes, name: bytes) -> bool: |
94 path = os.path.join(_package_path(package), name) | 94 path = os.path.join(_package_path(package), name) |
95 | 95 |
96 try: | 96 try: |
97 return os.path.isfile(pycompat.fsdecode(path)) | 97 return os.path.isfile(pycompat.fsdecode(path)) |
98 except (IOError, OSError): | 98 except OSError: |
99 return False | 99 return False |
100 | 100 |
101 def contents(package: bytes) -> "Iterator[bytes]": | 101 def contents(package: bytes) -> "Iterator[bytes]": |
102 path = pycompat.fsdecode(_package_path(package)) | 102 path = pycompat.fsdecode(_package_path(package)) |
103 | 103 |