From de65b122a2534a5bc61f7714f10125baee5d58f3 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sat, 22 Apr 2023 16:42:48 +0200 Subject: [PATCH] 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 Reviewed-by: Simon Glass --- tools/binman/control.py | 6 +++++- tools/buildman/control.py | 6 +++++- 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 0febcb79a6..68597c4e77 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 35f44c0cf3..09a11f25b3 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 48ffbc8ead..8eba5d3486 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 -- 2.39.5