Skip to content

Normalize relation case when combining license expressions #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codewithfourtix wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Normalize relation case when combining license expressions #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/license_expression/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1825,5 +1825,5 @@ def combine_expressions(
if len(expressions) == 1:
return expressions[0]

relation = {"AND": licensing.AND, "OR": licensing.OR}[relation]
relation = {"AND": licensing.AND, "OR": licensing.OR}[relation.upper()]
return relation(*expressions)
6 changes: 6 additions & 0 deletions tests/test_license_expression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2640,3 +2640,9 @@ def test_combine_expressions_with_duplicated_elements(self):

def test_combine_expressions_with_or_relationship(self):
assert str(combine_expressions(["mit", "apache-2.0"], "OR")) == "mit OR apache-2.0"


def test_combine_expressions_accepts_case_insensitive_relations():
for relation in ("and", "And", "AND", "or", "Or", "OR"):
result = combine_expressions(["mit", "apache-2.0"], relation=relation)
assert str(result) == f"mit {relation.upper()} apache-2.0"