Skip to content

Commit 377b205

Browse files
Fix #97 by parsing extracted licenses at SpdxDcoument level
Signed-off-by: Xavier Figueroa <[email protected]>
1 parent a390635 commit 377b205

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

spdx/parsers/rdf.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,7 @@ def _handle_license_list(self, lics_set, cls=None):
261261
for _, _, lics_member in self.graph.triples(
262262
(lics_set, self.spdx_namespace['member'], None)):
263263
try:
264-
if (lics_member, RDF.type, self.spdx_namespace['ExtractedLicensingInfo']) in self.graph:
265-
lics = self.handle_extracted_license(lics_member)
266-
if lics is not None:
267-
licenses.append(lics)
268-
else:
269-
licenses.append(self.handle_lics(lics_member))
264+
licenses.append(self.handle_lics(lics_member))
270265
except CardinalityError:
271266
self.value_error('LICS_LIST_MEMBER', lics_member)
272267
break
@@ -861,6 +856,9 @@ def parse(self, fil):
861856

862857
for s, _p, o in self.graph.triples((None, self.spdx_namespace['annotation'], None)):
863858
self.parse_annotation(o)
859+
860+
for s, _p, o in self.graph.triples((None, None, self.spdx_namespace['ExtractedLicensingInfo'])):
861+
self.handle_extracted_license(s)
864862

865863
validation_messages = []
866864
# Report extra errors if self.error is False otherwise there will be

0 commit comments

Comments
 (0)