From 01152c9410ba00274c8415a5d914dc33dfd0cf46 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 17 Sep 2021 14:59:19 +0200 Subject: [PATCH] meta: correct collections vs collections.abc deprecation collections.abc is available since 3.3 and doesn't need special handling. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/lib/oe/maketype.py | 7 +------ scripts/lib/build_perf/report.py | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/meta/lib/oe/maketype.py b/meta/lib/oe/maketype.py index d929c8b3e5..d36082c535 100644 --- a/meta/lib/oe/maketype.py +++ b/meta/lib/oe/maketype.py @@ -10,12 +10,7 @@ the arguments of the type's factory for details. import inspect import oe.types as types -try: - # Python 3.7+ - from collections.abc import Callable -except ImportError: - # Python < 3.7 - from collections import Callable +from collections.abc import Callable available_types = {} diff --git a/scripts/lib/build_perf/report.py b/scripts/lib/build_perf/report.py index 4e8e2a8a93..ab77424cc7 100644 --- a/scripts/lib/build_perf/report.py +++ b/scripts/lib/build_perf/report.py @@ -4,7 +4,8 @@ # SPDX-License-Identifier: GPL-2.0-only # """Handling of build perf test reports""" -from collections import OrderedDict, Mapping, namedtuple +from collections import OrderedDict, namedtuple +from collections.abc import Mapping from datetime import datetime, timezone from numbers import Number from statistics import mean, stdev, variance -- 2.40.1