[oe-commits] =?UTF-8?Q?An=C3=ADbal=20Lim=C3=B3n=20?=: license: Split visit_string in LicenseVisitor
git at git.openembedded.org
git at git.openembedded.org
Sat May 9 21:28:40 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: c16cf0a0331d128e4ba7341fe28510a9bfb7ee16
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c16cf0a0331d128e4ba7341fe28510a9bfb7ee16
Author: Aníbal Limón <anibal.limon at linux.intel.com>
Date: Fri May 8 20:41:30 2015 +0000
license: Split visit_string in LicenseVisitor
Create get_elements and visit_elements in LicenseVisitor based
on visit_string this allow to do modifications on elements before
parsing with AST.
Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oe/license.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py
index bc146a2..254279d 100644
--- a/meta/lib/oe/license.py
+++ b/meta/lib/oe/license.py
@@ -44,8 +44,8 @@ license_operator = re.compile('([' + license_operator_chars + '])')
license_pattern = re.compile('[a-zA-Z0-9.+_\-]+$')
class LicenseVisitor(ast.NodeVisitor):
- """Syntax tree visitor which can accept OpenEmbedded license strings"""
- def visit_string(self, licensestr):
+ """Get elements based on OpenEmbedded license strings"""
+ def get_elements(self, licensestr):
new_elements = []
elements = filter(lambda x: x.strip(), license_operator.split(licensestr))
for pos, element in enumerate(elements):
@@ -57,7 +57,16 @@ class LicenseVisitor(ast.NodeVisitor):
raise InvalidLicense(element)
new_elements.append(element)
- self.visit(ast.parse(' '.join(new_elements)))
+ return new_elements
+
+ """Syntax tree visitor which can accept elements previously generated with
+ OpenEmbedded license string"""
+ def visit_elements(self, elements):
+ self.visit(ast.parse(' '.join(elements)))
+
+ """Syntax tree visitor which can accept OpenEmbedded license strings"""
+ def visit_string(self, licensestr):
+ self.visit_elements(self.get_elements(licensestr))
class FlattenVisitor(LicenseVisitor):
"""Flatten a license tree (parsed from a string) by selecting one of each
More information about the Openembedded-commits
mailing list