diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2023-04-22 16:42:48 +0200 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2023-04-28 11:49:00 -0600 |
| commit | de65b122a2534a5bc61f7714f10125baee5d58f3 (patch) | |
| tree | a7971e5c583323dd06e392819b80f0882ef7ce4b | |
| parent | f53e973b84d5b60439c8f0cc98099c020b3ab83a (diff) | |
| download | u-boot-de65b122a2534a5bc61f7714f10125baee5d58f3.zip u-boot-de65b122a2534a5bc61f7714f10125baee5d58f3.tar.gz u-boot-de65b122a2534a5bc61f7714f10125baee5d58f3.tar.bz2 | |
tools: Fall back to importlib_resources on Python 3.6
importlib.resources became part of 3.7 only. Allow using distros with
3.6 and the importlib_resources backport.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | tools/binman/control.py | 6 | ||||
| -rw-r--r-- | tools/buildman/control.py | 6 | ||||
| -rwxr-xr-x | tools/patman/__main__.py | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/tools/binman/control.py b/tools/binman/control.py index 0febcb7..68597c4 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -7,7 +7,11 @@ from collections import OrderedDict import glob -import importlib.resources +try: + import importlib.resources +except ImportError: + # for Python 3.6 + import importlib_resources import os import pkg_resources import re diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 35f44c0..09a11f2 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -3,7 +3,11 @@ # import multiprocessing -import importlib.resources +try: + import importlib.resources +except ImportError: + # for Python 3.6 + import importlib_resources import os import shutil import subprocess diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py index 48ffbc8..8eba5d3 100755 --- a/tools/patman/__main__.py +++ b/tools/patman/__main__.py @@ -7,7 +7,11 @@ """See README for more information""" from argparse import ArgumentParser -import importlib.resources +try: + import importlib.resources +except ImportError: + # for Python 3.6 + import importlib_resources import os import re import sys |