Skip to content

Commit 4870314

Browse files
committed
* Exclude from License.to_dict() fields that are strings made only of
spaces. * Also simplify language handling and format code. Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent d1df873 commit 4870314

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

src/licensedcode/models.py

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,9 @@ def dict_fields(attr, value):
409409
if not value:
410410
return False
411411

412+
if isinstance(value, str) and not value.strip():
413+
return False
414+
412415
if attr.name in ('data_file', 'text_file', 'src_dir',):
413416
return False
414417

@@ -561,9 +564,8 @@ def validate(licenses, verbose=False, no_dupe_urls=False):
561564
if not lic.owner:
562565
error('No owner: Use "Unspecified" if not known.')
563566

564-
lang = lic.language
565-
if lang and lang != 'en' and lang not in known_languages:
566-
error(f'Unknown language: {lang}')
567+
if lic.language not in known_languages:
568+
error(f'Unknown language: {lic.language}')
567569

568570
if lic.is_unknown:
569571
if not 'unknown' in lic.key:
@@ -1481,9 +1483,8 @@ def validate(self, licensing=None):
14811483
if any(ignorables):
14821484
yield 'is_false_positive rule cannot have ignorable_* attributes.'
14831485

1484-
lang = self.language
1485-
if lang and lang != 'en' and lang not in known_languages:
1486-
yield f'Unknown language: {lang}'
1486+
if self.language not in known_languages:
1487+
yield f'Unknown language: {self.language}'
14871488

14881489
if not is_false_positive:
14891490
if not (0 <= self.minimum_coverage <= 100):
@@ -1508,13 +1509,19 @@ def validate(self, licensing=None):
15081509
yield 'Missing license_expression.'
15091510
else:
15101511
if not has_only_lower_license_keys(license_expression):
1511-
yield f'Invalid license_expression: {license_expression} Keys should be lowercase.'
1512+
yield (
1513+
f'Invalid license_expression: {license_expression} ,'
1514+
'keys should be lowercase.'
1515+
)
15121516

15131517
if licensing:
15141518
try:
15151519
licensing.parse(license_expression, validate=True, simple=True)
15161520
except ExpressionError as e:
1517-
yield f'Failed to parse and validate license_expression: {license_expression} with error: {e}'
1521+
yield (
1522+
f'Failed to parse and validate license_expression: '
1523+
f'{license_expression} with error: {e}'
1524+
)
15181525

15191526
if self.referenced_filenames:
15201527
if len(set(self.referenced_filenames)) != len(self.referenced_filenames):

0 commit comments

Comments
 (0)