From abc93390a3f19bc4cc159c5690a478b9e2270906 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. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/license.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/lib') diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py index 665d32ecbb..b5d378a549 100644 --- a/meta/lib/oe/license.py +++ b/meta/lib/oe/license.py @@ -74,6 +74,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) @@ -227,6 +230,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 1.2.3-korg