commit c0cdbe4a8b3116404218b713de7edc147c09bff2
author Simon Glass <sjg@chromium.org> Mon Sep 04 09:54:59 2023 -0600
committer Simon Glass <sjg@chromium.org> Sat Sep 23 09:00:37 2023 -0600
tree 2d86f857889aae1c56b03bf0dfe5c1713a251cec
parent 25f24c3bca264a35f7082db84104dc7798d0cf4c

buildman: Fix full help for Python 3.8

With Python versions older than 3.9 Buildman produces an error on
start-up. Fix this with a workaround for importlib.

There is already a workaround for v3.6 but I am not sure if that is still
functioning.

Signed-off-by: Simon Glass <sjg@chromium.org>

tools/buildman/main.py

diff --git a/tools/buildman/main.py b/tools/buildman/main.py
index 5f42a58..3cf877e 100755
--- a/tools/buildman/main.py
+++ b/tools/buildman/main.py
@@ -7,7 +7,7 @@
 """See README for more information"""
 
 try:
-    from importlib.resources import files
+    import importlib.resources
 except ImportError:
     # for Python 3.6
     import importlib_resources
@@ -83,7 +83,13 @@
         run_test_coverage()
 
     elif args.full_help:
-        tools.print_full_help(str(files('buildman').joinpath('README.rst')))
+        if hasattr(importlib.resources, 'files'):
+            dirpath = importlib.resources.files('buildman')
+            tools.print_full_help(str(dirpath.joinpath('README.rst')))
+        else:
+            with importlib.resources.path('buildman', 'README.rst') as readme:
+                tools.print_full_help(str(readme))
+
 
     # Build selected commits for selected boards
     else: