summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/persist_data.py
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-11-22 10:24:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-24 10:08:28 +0000
commit0d236d8fafe94dfece36bd305f0bac0464e0b5e2 (patch)
tree856179afecc392c4e164e4d07fd37602a105d012 /bitbake/lib/bb/persist_data.py
parentfbd5ce2c50c7813675185b418ab53b170416ac25 (diff)
downloadpoky-0d236d8fafe94dfece36bd305f0bac0464e0b5e2.tar.gz
bitbake: bitbake: correct the collections vs collections.abc deprecation
This becomes a hard error in python 3.10. (Bitbake rev: 2805102e2a142c8e821519b651e4035353bbb717) 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 'bitbake/lib/bb/persist_data.py')
-rw-r--r--bitbake/lib/bb/persist_data.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/persist_data.py b/bitbake/lib/bb/persist_data.py
index c6a209fb3f..6f32d81afe 100644
--- a/bitbake/lib/bb/persist_data.py
+++ b/bitbake/lib/bb/persist_data.py
@@ -12,6 +12,7 @@ currently, providing a key/value store accessed by 'domain'.
12# 12#
13 13
14import collections 14import collections
15import collections.abc
15import contextlib 16import contextlib
16import functools 17import functools
17import logging 18import logging
@@ -19,7 +20,7 @@ import os.path
19import sqlite3 20import sqlite3
20import sys 21import sys
21import warnings 22import warnings
22from collections import Mapping 23from collections.abc import Mapping
23 24
24sqlversion = sqlite3.sqlite_version_info 25sqlversion = sqlite3.sqlite_version_info
25if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3): 26if 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):
29logger = logging.getLogger("BitBake.PersistData") 30logger = logging.getLogger("BitBake.PersistData")
30 31
31@functools.total_ordering 32@functools.total_ordering
32class SQLTable(collections.MutableMapping): 33class SQLTable(collections.abc.MutableMapping):
33 class _Decorators(object): 34 class _Decorators(object):
34 @staticmethod 35 @staticmethod
35 def retry(*, reconnect=True): 36 def retry(*, reconnect=True):