From 0e3391131391cae16307bd7255311eb528605f25 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 13 Oct 2021 16:10:23 +0100 Subject: oe/license: implement ast.NodeVisitor.visit_Constant Since Python 3.8 visit_Num(), visit_Str() and so on are all deprecated and replaced with visit_Constant. We can't yet remove the deprecated functions until we require 3.8, but we can implement visit_Constant to silence the deprecation warnings. (From OE-Core rev: 18f10a51387cdee7c7058a3cb3f7c8c24c57c36a) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit abc93390a3f19bc4cc159c5690a478b9e2270906) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/lib/oe/license.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py index c1274a61de..c4efbe142b 100644 --- a/meta/lib/oe/license.py +++ b/meta/lib/oe/license.py @@ -81,6 +81,9 @@ class FlattenVisitor(LicenseVisitor): def visit_Str(self, node): self.licenses.append(node.s) + def visit_Constant(self, node): + self.licenses.append(node.value) + def visit_BinOp(self, node): if isinstance(node.op, ast.BitOr): left = FlattenVisitor(self.choose_licenses) @@ -234,6 +237,9 @@ class ListVisitor(LicenseVisitor): def visit_Str(self, node): self.licenses.add(node.s) + def visit_Constant(self, node): + self.licenses.add(node.value) + def list_licenses(licensestr): """Simply get a list of all licenses mentioned in a license string. Binary operators are not applied or taken into account in any way""" -- cgit v1.2.3-54-g00ecf