Skip to content
Open
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
6 changes: 5 additions & 1 deletion src/license_expression/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -785,10 +785,14 @@ def validate(self, expression, strict=True, **kwargs):
# Check `expression` type and syntax
try:
parsed_expression = self.parse(expression, strict=strict)
except ExpressionError as e:
except ExpressionParseError as e:
expression_info.errors.append(str(e))
expression_info.invalid_symbols.append(e.token_string)
return expression_info
except ExpressionError as e:
expression_info.errors.append(str(e))
expression_info.invalid_symbols.append(str(expression))
return expression_info

# Check `expression` keys (validate)
try:
Expand Down
9 changes: 9 additions & 0 deletions tests/test_license_expression.py
Original file line number Diff line number Diff line change
Expand Up @@ -2422,6 +2422,15 @@ def test_validation_invalid_license_key(self):
assert result.errors == ["Unknown license key(s): cool-license"]
assert result.invalid_symbols == ["cool-license"]

def test_validation_invalid_license_key_chara(self):
result = self.licensing.validate("cool,license")
assert result.original_expression == "cool,license"
assert not result.normalized_expression
assert result.errors == [
"Invalid license key: the valid characters are: letters and numbers, underscore, dot, colon or hyphen signs and spaces: 'cool,license'"
]
assert result.invalid_symbols == ["cool,license"]

def test_validate_exception(self):
result = self.licensing.validate("GPL-2.0-or-later WITH WxWindows-exception-3.1")
assert result.original_expression == "GPL-2.0-or-later WITH WxWindows-exception-3.1"
Expand Down
Loading