tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Do not import module to find the path of one of its file

Browse Source 
Closes #14892
This commit is contained in:
Nicolas Évrard
2026-05-15 22:23:22 +02:00
parent bba6e052cb
commit 7155dcf872
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trytond/trytond/tests/test_tools.py
+4 -2
View File
@@ -125,11 +125,13 @@ class ToolsTestCase(TestCase):
with file_open('ir/noexist'):
pass
with self.assertRaisesRegex(IOError, "Permission denied:"):
with self.assertRaisesRegex(
FileNotFoundError, "No such file or directory:"):
with file_open('/etc/passwd'):
pass
with self.assertRaisesRegex(IOError, "Permission denied:"):
with self.assertRaisesRegex(
FileNotFoundError, "No such file or directory:"):
with file_open('../../foo'):
pass
trytond/trytond/tools/misc.py
+20 -5
View File
@@ -5,6 +5,7 @@
Miscelleanous tools used by tryton
"""
import importlib
import importlib.resources
import io
import math
import os
@@ -71,13 +72,27 @@ def find_path(name, subdir='modules', _test=os.path.isfile):
path = secure_join(_root_path, module_name, module_path)
else:
try:
module = import_module(module_name)
ep, = entry_points().select(
group=MODULES_GROUP, name=module_name)
except ValueError:
ep = None
try:
if ep is None:
spec = importlib.util.find_spec(
f'{MODULES_GROUP}.{module_name}')
else:
spec = importlib.util.find_spec(ep.module)
except ModuleNotFoundError:
path = secure_join(_root_path, subdir, name)
raise FileNotFoundError(
f"No such file or directory: {name!r}")
else:
path = os.path.dirname(module.__file__)
if module_path:
path = secure_join(path, module_path)
if spec and spec.has_location:
path = os.path.dirname(spec.origin)
if module_path:
path = secure_join(path, module_path)
else:
raise FileNotFoundError(
f"No such file or directory: {name!r}")
else:
path = secure_join(_root_path, subdir, name)
else: