[Request] [- ] D11311: resources: stop important a non existent FileNotFoundError
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Thu Aug 19 18:12:27 UTC 2021
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
The error was hidden by the wide try/except
REPOSITORY
rHG Mercurial
BRANCH
stable
REVISION DETAIL
https://phab.mercurial-scm.org/D11311
AFFECTED FILES
mercurial/utils/resourceutil.py
CHANGE DETAILS
diff --git a/mercurial/utils/resourceutil.py b/mercurial/utils/resourceutil.py
--- a/mercurial/utils/resourceutil.py
+++ b/mercurial/utils/resourceutil.py
@@ -64,11 +64,6 @@
# Force loading of the resources module
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):
return resources.open_binary( # pytype: disable=module-attr
pycompat.sysstr(package), pycompat.sysstr(name)
@@ -90,9 +85,6 @@
# importlib.resources was not found (almost definitely because we're on a
# Python version before 3.7)
- class FileNotFoundError(RuntimeError):
- pass
-
def open_resource(package, name):
path = os.path.join(_package_path(package), name)
return open(path, "rb")
To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20210819/281fd45f/attachment.html>
More information about the Mercurial-patches
mailing list