diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-09-16 22:22:33 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-16 22:15:44 +0100 |
commit | ae219e1f7460077f4492b31ac91cef4cf9b17277 (patch) | |
tree | 8e01316a0ac11df9a34f0a44e8473dead62f1ea1 | |
parent | 62d96ea2afbb0cfdb0d1f932dc96643e7bcd7f26 (diff) | |
download | bitbake-ae219e1f7460077f4492b31ac91cef4cf9b17277.tar.gz |
bitbake: correct the collections vs collections.abc deprecation
This becomes a hard error in python 3.10.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/cache.py | 3 | ||||
-rw-r--r-- | lib/bb/data_smart.py | 2 | ||||
-rw-r--r-- | lib/bb/persist_data.py | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py index 73bc6e966..4e08c100a 100644 --- a/lib/bb/cache.py +++ b/lib/bb/cache.py @@ -19,7 +19,8 @@ import os import logging import pickle -from collections import defaultdict, Mapping +from collections import defaultdict +from collections.abc import Mapping import bb.utils from bb import PrefixLoggerAdapter import re diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index e4afac64b..73e33ee10 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -17,7 +17,7 @@ BitBake build tools. # Based on functions from the base bb module, Copyright 2003 Holger Schurig import copy, re, sys, traceback -from collections import MutableMapping +from collections.abc import MutableMapping import logging import hashlib import bb, bb.codeparser diff --git a/lib/bb/persist_data.py b/lib/bb/persist_data.py index 286cc0a99..49c9a0d51 100644 --- a/lib/bb/persist_data.py +++ b/lib/bb/persist_data.py @@ -12,13 +12,14 @@ currently, providing a key/value store accessed by 'domain'. # import collections +import collections.abc import contextlib import functools import logging import os.path import sqlite3 import sys -from collections import Mapping +from collections.abc import Mapping sqlversion = sqlite3.sqlite_version_info if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3): @@ -28,7 +29,7 @@ if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3): logger = logging.getLogger("BitBake.PersistData") @functools.total_ordering -class SQLTable(collections.MutableMapping): +class SQLTable(collections.abc.MutableMapping): class _Decorators(object): @staticmethod def retry(*, reconnect=True): |