summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorChris Laplante <chris.laplante@agilent.com>2020-08-25 12:51:41 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-26 09:05:38 +0100
commit77441a08d4ba27996a651651e65f63af76e2503e (patch)
tree994b1fa370372cf0d2c45fa066b3ae5fb90e6366 /bitbake
parent392b2cf529660da75013352a4249492ac55b36e6 (diff)
downloadpoky-77441a08d4ba27996a651651e65f63af76e2503e.tar.gz
bitbake: compat.py: remove file since it no longer actually implements anything
Now that compat.py just imports Python standard library stuff, get rid of the layer of indirection. (Bitbake rev: e2be6defbb9fcf25f9df04c3b452d0dba48dfd03) Signed-off-by: Chris Laplante <chris.laplante@agilent.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/compat.py10
-rw-r--r--bitbake/lib/bb/event.py16
-rw-r--r--bitbake/lib/bb/persist_data.py8
-rw-r--r--bitbake/lib/bb/tests/event.py17
4 files changed, 21 insertions, 30 deletions
diff --git a/bitbake/lib/bb/compat.py b/bitbake/lib/bb/compat.py
deleted file mode 100644
index 49356681ab..0000000000
--- a/bitbake/lib/bb/compat.py
+++ /dev/null
@@ -1,10 +0,0 @@
1#
2# SPDX-License-Identifier: GPL-2.0-only
3#
4
5"""Code pulled from future python versions, here for compatibility"""
6
7from collections import MutableMapping, KeysView, ValuesView, ItemsView, OrderedDict
8from functools import total_ordering
9
10
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index 0e6d9b2964..694b470520 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -10,17 +10,17 @@ BitBake build tools.
10# SPDX-License-Identifier: GPL-2.0-only 10# SPDX-License-Identifier: GPL-2.0-only
11# 11#
12 12
13import sys
14import pickle
15import logging
16import atexit
17import traceback
18import ast 13import ast
14import atexit
15import collections
16import logging
17import pickle
18import sys
19import threading 19import threading
20import traceback
20 21
21import bb.utils
22import bb.compat
23import bb.exceptions 22import bb.exceptions
23import bb.utils
24 24
25# This is the pid for which we should generate the event. This is set when 25# This is the pid for which we should generate the event. This is set when
26# the runqueue forks off. 26# the runqueue forks off.
@@ -56,7 +56,7 @@ def set_class_handlers(h):
56 _handlers = h 56 _handlers = h
57 57
58def clean_class_handlers(): 58def clean_class_handlers():
59 return bb.compat.OrderedDict() 59 return collections.OrderedDict()
60 60
61# Internal 61# Internal
62_handlers = clean_class_handlers() 62_handlers = clean_class_handlers()
diff --git a/bitbake/lib/bb/persist_data.py b/bitbake/lib/bb/persist_data.py
index 7357ab2d44..5f4fbe3508 100644
--- a/bitbake/lib/bb/persist_data.py
+++ b/bitbake/lib/bb/persist_data.py
@@ -12,14 +12,14 @@ currently, providing a key/value store accessed by 'domain'.
12# 12#
13 13
14import collections 14import collections
15import contextlib
16import functools
15import logging 17import logging
16import os.path 18import os.path
19import sqlite3
17import sys 20import sys
18import warnings 21import warnings
19from bb.compat import total_ordering
20from collections import Mapping 22from collections import Mapping
21import sqlite3
22import contextlib
23 23
24sqlversion = sqlite3.sqlite_version_info 24sqlversion = sqlite3.sqlite_version_info
25if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3): 25if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3):
@@ -28,7 +28,7 @@ if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3):
28 28
29logger = logging.getLogger("BitBake.PersistData") 29logger = logging.getLogger("BitBake.PersistData")
30 30
31@total_ordering 31@functools.total_ordering
32class SQLTable(collections.MutableMapping): 32class SQLTable(collections.MutableMapping):
33 class _Decorators(object): 33 class _Decorators(object):
34 @staticmethod 34 @staticmethod
diff --git a/bitbake/lib/bb/tests/event.py b/bitbake/lib/bb/tests/event.py
index 9229b63d47..9ca7e9bc8e 100644
--- a/bitbake/lib/bb/tests/event.py
+++ b/bitbake/lib/bb/tests/event.py
@@ -6,17 +6,18 @@
6# SPDX-License-Identifier: GPL-2.0-only 6# SPDX-License-Identifier: GPL-2.0-only
7# 7#
8 8
9import unittest 9import collections
10import bb
11import logging
12import bb.compat
13import bb.event
14import importlib 10import importlib
11import logging
12import pickle
15import threading 13import threading
16import time 14import time
17import pickle 15import unittest
18from unittest.mock import Mock 16from unittest.mock import Mock
19from unittest.mock import call 17from unittest.mock import call
18
19import bb
20import bb.event
20from bb.msg import BBLogFormatter 21from bb.msg import BBLogFormatter
21 22
22 23
@@ -75,7 +76,7 @@ class EventHandlingTest(unittest.TestCase):
75 76
76 def _create_test_handlers(self): 77 def _create_test_handlers(self):
77 """ Method used to create a test handler ordered dictionary """ 78 """ Method used to create a test handler ordered dictionary """
78 test_handlers = bb.compat.OrderedDict() 79 test_handlers = collections.OrderedDict()
79 test_handlers["handler1"] = self._test_process.handler1 80 test_handlers["handler1"] = self._test_process.handler1
80 test_handlers["handler2"] = self._test_process.handler2 81 test_handlers["handler2"] = self._test_process.handler2
81 return test_handlers 82 return test_handlers
@@ -96,7 +97,7 @@ class EventHandlingTest(unittest.TestCase):
96 97
97 def test_clean_class_handlers(self): 98 def test_clean_class_handlers(self):
98 """ Test clean_class_handlers method """ 99 """ Test clean_class_handlers method """
99 cleanDict = bb.compat.OrderedDict() 100 cleanDict = collections.OrderedDict()
100 self.assertEqual(cleanDict, 101 self.assertEqual(cleanDict,
101 bb.event.clean_class_handlers()) 102 bb.event.clean_class_handlers())
102 103