( )⚙ D11311 resources: stop important a non existent FileNotFoundError

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11311

resources: stop important a non existent FileNotFoundError
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdf94c13ddf60: resources: stop important a non existent FileNotFoundError
Summary

The error was hidden by the wide try/except

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Aug 19 2021, 2:12 PM
marmoute added a commit: rHGdf94c13ddf60: resources: stop important a non existent FileNotFoundError.Aug 22 2021, 4:37 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGdf94c13ddf60: resources: stop important a non existent FileNotFoundError (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 29984

mercurial/utils/resourceutil.py

# further down # further down
from importlib import resources from importlib import resources
from .. import encoding 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
# pytype: disable=import-error
from importlib.resources import FileNotFoundError
# pytype: enable=import-error
def open_resource(package, name): def open_resource(package, name):
return resources.open_binary( # pytype: disable=module-attr return resources.open_binary( # pytype: disable=module-attr
pycompat.sysstr(package), pycompat.sysstr(name) pycompat.sysstr(package), pycompat.sysstr(name)
) )
def is_resource(package, name): def is_resource(package, name):
return resources.is_resource( # pytype: disable=module-attr return resources.is_resource( # pytype: disable=module-attr
pycompat.sysstr(package), encoding.strfromlocal(name) pycompat.sysstr(package), encoding.strfromlocal(name)
) )
def contents(package): def contents(package):
# pytype: disable=module-attr # pytype: disable=module-attr
for r in resources.contents(pycompat.sysstr(package)): for r in resources.contents(pycompat.sysstr(package)):
# pytype: enable=module-attr # pytype: enable=module-attr
yield encoding.strtolocal(r) 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)
class FileNotFoundError(RuntimeError):
pass
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: