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-19 11:33:14 +0100 |
| commit | 5128defbc3996af5f8e28f5681ba4ad5b3c5d023 (patch) | |
| tree | 4e661fcc44f37b1045f4d8e3ce251e25a9265084 | |
| parent | c5d1550fe696ce0d131529d4682fd669f8bf25a9 (diff) | |
| download | poky-5128defbc3996af5f8e28f5681ba4ad5b3c5d023.tar.gz | |
meta: correct collections vs collections.abc deprecation
collections.abc is available since 3.3 and doesn't need special handling.
(From OE-Core rev: 01152c9410ba00274c8415a5d914dc33dfd0cf46)
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. | |||
| 10 | 10 | ||
| 11 | import inspect | 11 | import inspect |
| 12 | import oe.types as types | 12 | import oe.types as types |
| 13 | try: | 13 | from collections.abc import Callable |
| 14 | # Python 3.7+ | ||
| 15 | from collections.abc import Callable | ||
| 16 | except ImportError: | ||
| 17 | # Python < 3.7 | ||
| 18 | from collections import Callable | ||
| 19 | 14 | ||
| 20 | available_types = {} | 15 | available_types = {} |
| 21 | 16 | ||
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 @@ | |||
| 4 | # SPDX-License-Identifier: GPL-2.0-only | 4 | # SPDX-License-Identifier: GPL-2.0-only |
| 5 | # | 5 | # |
| 6 | """Handling of build perf test reports""" | 6 | """Handling of build perf test reports""" |
| 7 | from collections import OrderedDict, Mapping, namedtuple | 7 | from collections import OrderedDict, namedtuple |
| 8 | from collections.abc import Mapping | ||
| 8 | from datetime import datetime, timezone | 9 | from datetime import datetime, timezone |
| 9 | from numbers import Number | 10 | from numbers import Number |
| 10 | from statistics import mean, stdev, variance | 11 | from statistics import mean, stdev, variance |
