Skip to content

Commit 5b6998d

Browse files
committed
Add comments and improve docstrings
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent c4db8f9 commit 5b6998d

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/packagedcode/licensing.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
from summarycode.classify import LEGAL_STARTS_ENDS
3636
from summarycode.classify import README_STARTS_ENDS
3737

38-
3938
"""
4039
Detect and normalize licenses as found in package manifests data.
4140
"""
@@ -57,7 +56,6 @@ def logger_debug(*args):
5756
def logger_debug(*args):
5857
return logger.debug(' '.join(isinstance(a, str) and a or repr(a) for a in args))
5958

60-
6159
RESOURCE_TO_PACKAGE_LICENSE_FIELDS = {
6260
'detected_license_expression': 'declared_license_expression',
6361
'detected_license_expression_spdx': 'declared_license_expression_spdx',
@@ -253,7 +251,7 @@ def add_referenced_license_detection_from_package(resource, codebase):
253251
continue
254252

255253
for sibling_detection in sibling_license_detections:
256-
254+
257255
modified = True
258256
detection_modified = True
259257
license_match_mappings.extend(sibling_detection["matches"])
@@ -713,8 +711,7 @@ def get_normalized_license_detections(
713711
expression_symbols=None,
714712
):
715713
"""
716-
Return a normalized license expression string detected from a list of
717-
declared license items.
714+
Return a list of LicenseDetection detected in ``extracted license`` data.
718715
"""
719716
license_detections = []
720717

@@ -737,6 +734,7 @@ def get_normalized_license_detections(
737734
logger_debug(f'get_normalized_license_detections: str:')
738735

739736
elif isinstance(extracted_license, dict):
737+
# FIXME: why ignoring keys?
740738
for extracted_license_statement in extracted_license.values():
741739
detections = get_license_detections_for_extracted_license_statement(
742740
extracted_license_statement=extracted_license_statement,
@@ -751,6 +749,7 @@ def get_normalized_license_detections(
751749
license_detections.extend(detections)
752750

753751
if not license_detections:
752+
# FIXME: we should Never detect on dict representation, but on a YAML dump instead
754753
unknown_dict_object = repr(dict(extracted_license.items()))
755754
unknown_detection = get_unknown_license_detection(query_string=unknown_dict_object)
756755
license_detections.append(unknown_detection)
@@ -822,7 +821,7 @@ def get_license_detections_and_expression(
822821
try_as_expression=True,
823822
approximate=True,
824823
expression_symbols=None,
825-
datasource_id = None,
824+
datasource_id=None,
826825
):
827826
"""
828827
Given a text `extracted_license_statement` return a list of LicenseDetection objects.
@@ -887,8 +886,7 @@ def get_license_detections_for_extracted_license_statement(
887886
expression_symbols=None,
888887
):
889888
"""
890-
Return a list of LicenseDetection objects after detecting licenses in
891-
the given `extracted_license_statement`.
889+
Return a list of LicenseDetection detected the ``extracted_license_statement`` string.
892890
"""
893891
if not extracted_license_statement:
894892
return []

0 commit comments

Comments
 (0)