diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-08-08 15:49:13 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-04-09 17:57:17 +0530 |
commit | b254ab6ce34da3d3241a51958b5770664d317fcc (patch) | |
tree | 4732b9dfc51f0a090a834ab44c29af7cb4563fe5 | |
parent | 7b1dba1a464862e35295756ecf52b24d0962528b (diff) | |
download | openembedded-core-contrib-b254ab6ce34da3d3241a51958b5770664d317fcc.tar.gz |
lib/oe: Fix collections ABCs DeprecationWarning in Python 3.7+
- Prefer collections.abc (new in Python 3.3) over collections for abstract base classes
- In Python 3.8, the abstract base classes in collections.abc will no longer be exposed in
the regular collections module. This will help create a clearer distinction between
the concrete classes and the abstract base classes."
- https://docs.python.org/3.7/whatsnew/3.7.html#deprecated
- see https://github.com/python/cpython/commit/c66f9f8d3909f588c251957d499599a1680e2320
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta/lib/oe/maketype.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/lib/oe/maketype.py b/meta/lib/oe/maketype.py index f88981dd90..c36e7b5604 100644 --- a/meta/lib/oe/maketype.py +++ b/meta/lib/oe/maketype.py @@ -7,7 +7,12 @@ the arguments of the type's factory for details. import inspect import oe.types as types -import collections +try: + # Python 3.7+ + from collections.abc import Callable +except ImportError: + # Python < 3.7 + from collections import Callable available_types = {} @@ -96,7 +101,7 @@ for name in dir(types): continue obj = getattr(types, name) - if not isinstance(obj, collections.Callable): + if not isinstance(obj, Callable): continue register(name, obj) |