diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2021-09-17 14:59:19 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-17 21:32:51 +0100 |
| commit | 01152c9410ba00274c8415a5d914dc33dfd0cf46 (patch) | |
| tree | 72168095ed660294376f68253c929bf16703dd1f | |
| parent | e9715d4234eb7b45dee8b323799014646f0a1b07 (diff) | |
| download | openembedded-core-contrib-01152c9410ba00274c8415a5d914dc33dfd0cf46.tar.gz | |
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 <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/maketype.py | 7 | ||||
| -rw-r--r-- | 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 |