Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/summarycode/score.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ def get_primary_license(declared_license_expressions):
if len(single_expressions) == 1:
return single_expressions[0]
else:
return ''
return None

# Group single expressions to joined expressions to see if single
# expressions are accounted for in a joined expression
Expand All @@ -474,4 +474,4 @@ def get_primary_license(declared_license_expressions):
if len(single_expressions_by_joined_expressions) == 1 and not not_in_joined_expressions:
return next(iter(single_expressions_by_joined_expressions))
else:
return ''
return None
14 changes: 9 additions & 5 deletions src/summarycode/summarizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,10 @@ def get_primary_language(programming_language_tallies):
programming_languages_by_count = {
entry['count']: entry['value'] for entry in programming_language_tallies
}
primary_language = ''
primary_language = None
if programming_languages_by_count:
highest_count = max(programming_languages_by_count)
primary_language = programming_languages_by_count[highest_count] or ''
primary_language = programming_languages_by_count[highest_count] or None
return primary_language


Expand All @@ -219,7 +219,7 @@ def get_origin_info_from_top_level_packages(top_level_packages, codebase):
``codebase``.
"""
if not top_level_packages:
return '', [], ''
return None, [], None

license_expressions = []
programming_languages = []
Expand Down Expand Up @@ -250,7 +250,7 @@ def get_origin_info_from_top_level_packages(top_level_packages, codebase):
relation='AND',
)

declared_license_expression = ''
declared_license_expression = None
if combined_declared_license_expression:
declared_license_expression = str(
Licensing().parse(combined_declared_license_expression).simplify()
Expand All @@ -270,6 +270,10 @@ def get_origin_info_from_top_level_packages(top_level_packages, codebase):
key_file_resource = codebase.get_resource(path=datafile_path)
if not key_file_resource:
continue

if not hasattr(key_file_resource, 'holders'):
break

holders = [h['holder'] for h in key_file_resource.holders]
declared_holders.extend(holders)
# Normalize holder names before collecting them
Expand All @@ -279,7 +283,7 @@ def get_origin_info_from_top_level_packages(top_level_packages, codebase):

# Programming language
unique_programming_languages = unique(programming_languages)
primary_language = ''
primary_language = None
if len(unique_programming_languages) == 1:
primary_language = unique_programming_languages[0]

Expand Down
Loading