From: Simon Glass <sjg@chromium.org>
Date: Sat, 4 Nov 2023 16:25:24 +0000 (-0600)
Subject: patman: Correct Python 3.6 behaviour
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=abf7004321c05333afb56ae230095f9bee55e924;p=u-boot.git

patman: Correct Python 3.6 behaviour

The importlib_resources import is not actually used. Fix this so that
patman can run on Python 3.6 to some extent, once
'pip3 install importlib-resources' has been run.

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

diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py
index d53f686a2d..f645b38b64 100755
--- a/tools/patman/__main__.py
+++ b/tools/patman/__main__.py
@@ -7,10 +7,10 @@
 """See README for more information"""
 
 try:
-    import importlib.resources
+    from importlib import resources
 except ImportError:
     # for Python 3.6
-    import importlib_resources
+    import importlib_resources as resources
 import os
 import re
 import sys
@@ -69,7 +69,7 @@ def run_patman():
                                 print(cca)
 
         elif args.full_help:
-            with importlib.resources.path('patman', 'README.rst') as readme:
+            with resources.path('patman', 'README.rst') as readme:
                 tools.print_full_help(str(readme))
         else:
             # If we are not processing tags, no need to warning about bad ones