( )⚙ D11312 resources: narrow the try:except clause to minimum

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11312

resources: narrow the try:except clause to minimum
ClosedPublic

Authored by marmoute on Aug 19 2021, 2:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG08f16b3331df: resources: narrow the try:except clause to minimum
Summary

Otherwise this mind hides other import or attribute errors.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Aug 19 2021, 2:12 PM
marmoute added a commit: rHG08f16b3331df: resources: narrow the try:except clause to minimum.Aug 22 2021, 4:55 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG08f16b3331df: resources: narrow the try:except clause to minimum (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/resourceutil.py (39 lines)

Diff 29961

mercurial/utils/resourceutil.py

return os.path.join(_rootpath, *package.split(b".")) return os.path.join(_rootpath, *package.split(b"."))
try: try:
# importlib.resources exists from Python 3.7; see fallback in except clause # importlib.resources exists from Python 3.7; see fallback in except clause
# further down # further down
from importlib import resources from importlib import resources
from .. import encoding
# Force loading of the resources module # Force loading of the resources module
resources.open_binary # pytype: disable=module-attr resources.open_binary # pytype: disable=module-attr
def open_resource(package, name):
return resources.open_binary( # pytype: disable=module-attr
pycompat.sysstr(package), pycompat.sysstr(name)
)
def is_resource(package, name):
return resources.is_resource( # pytype: disable=module-attr
pycompat.sysstr(package), encoding.strfromlocal(name)
)
def contents(package):
# pytype: disable=module-attr
for r in resources.contents(pycompat.sysstr(package)):
# pytype: enable=module-attr
yield encoding.strtolocal(r)
except (ImportError, AttributeError): except (ImportError, AttributeError):
# importlib.resources was not found (almost definitely because we're on a # importlib.resources was not found (almost definitely because we're on a
# Python version before 3.7) # Python version before 3.7)
def open_resource(package, name): def open_resource(package, name):
path = os.path.join(_package_path(package), name) path = os.path.join(_package_path(package), name)
return open(path, "rb") return open(path, "rb")
def is_resource(package, name): def is_resource(package, name):
path = os.path.join(_package_path(package), name) path = os.path.join(_package_path(package), name)
try: try:
return os.path.isfile(pycompat.fsdecode(path)) return os.path.isfile(pycompat.fsdecode(path))
except (IOError, OSError): except (IOError, OSError):
return False return False
def contents(package): def contents(package):
path = pycompat.fsdecode(_package_path(package)) path = pycompat.fsdecode(_package_path(package))
for p in os.listdir(path): for p in os.listdir(path):
yield pycompat.fsencode(p) yield pycompat.fsencode(p)
else:
from .. import encoding
def open_resource(package, name):
return resources.open_binary( # pytype: disable=module-attr
pycompat.sysstr(package), pycompat.sysstr(name)
)
def is_resource(package, name):
return resources.is_resource( # pytype: disable=module-attr
pycompat.sysstr(package), encoding.strfromlocal(name)
)
def contents(package):
# pytype: disable=module-attr
for r in resources.contents(pycompat.sysstr(package)):
# pytype: enable=module-attr
yield encoding.strtolocal(r)