diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2021-11-22 10:24:42 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-24 10:08:02 +0000 |
| commit | 2805102e2a142c8e821519b651e4035353bbb717 (patch) | |
| tree | f97db344404602eef909c1bca0366b915ce7245a /lib | |
| parent | 15dadb69b4c5d29b80770e55d1e9afbe47084aa4 (diff) | |
| download | bitbake-2805102e2a142c8e821519b651e4035353bbb717.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>
(cherry picked from commit ae219e1f7460077f4492b31ac91cef4cf9b17277)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -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 27eb27179..5f9c0a779 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 8291ca65e..aa9ac2c8d 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 c6a209fb3..6f32d81af 100644 --- a/lib/bb/persist_data.py +++ b/lib/bb/persist_data.py @@ -12,6 +12,7 @@ currently, providing a key/value store accessed by 'domain'. # import collections +import collections.abc import contextlib import functools import logging @@ -19,7 +20,7 @@ import os.path import sqlite3 import sys import warnings -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): @@ -29,7 +30,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): |