From 9fbfaba0a707eb4af2792b966a4f296f7778404f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 29 Aug 2020 11:36:14 -0600 Subject: [PATCH] binman: Use pkg_resources to find resources At present we look for resources based on the path of the Python module that wants them. Instead we should use Python's pkg_resources feature which is designed for this purpose. Update binman to use this. Signed-off-by: Simon Glass --- tools/binman/control.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/binman/control.py b/tools/binman/control.py index 60e89d3776..3b52326641 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -8,6 +8,8 @@ from collections import OrderedDict import glob import os +import pkg_resources + import sys from patman import tools @@ -58,8 +60,8 @@ def GetEntryModules(include_testing=True): Returns: Set of paths to entry class filenames """ - our_path = os.path.dirname(os.path.realpath(__file__)) - glob_list = glob.glob(os.path.join(our_path, 'etype/*.py')) + glob_list = pkg_resources.resource_listdir(__name__, 'etype') + glob_list = [fname for fname in glob_list if fname.endswith('.py')] return set([os.path.splitext(os.path.basename(item))[0] for item in glob_list if include_testing or '_testing' not in item]) -- 2.39.5