Unify two very similar functions

Author: befeleme

pyp2spec/license_processor.py

@@ -146,8 +146,8 @@ def _is_compliant_with_fedora(identifier, fedora_licenses):
     return False
 
 
-def good_for_fedora(spdx_identifiers, *, licenses_dict=None, session=None):
-    """Determine whether all of the given SPDX identifiers are good for Fedora.
+def check_compliance(license, *, licenses_dict=None, session=None):
+    """Determine whether the license is good for Fedora.
 
     Store the results in the checked_identifiers dictionary, under the
     respective `bad` and `good` keys.
@@ -167,6 +167,7 @@ def good_for_fedora(spdx_identifiers, *, licenses_dict=None, session=None):
         "good": [],
     }
 
+    spdx_identifiers = license_keyword_to_spdx_identifiers(license)
     if not spdx_identifiers:
         return (False, checked_identifies)
     for spdx_identifier in spdx_identifiers:
@@ -179,17 +180,6 @@ def good_for_fedora(spdx_identifiers, *, licenses_dict=None, session=None):
     return (True, checked_identifies)
 
 
-def check_compliance(license, *, session=None, licenses_dict=None):
-    identifiers = license_keyword_to_spdx_identifiers(license)
-
-    is_compliant, checked_identifiers = good_for_fedora(
-        identifiers,
-        session=session,
-        licenses_dict=licenses_dict
-    )
-    return is_compliant, checked_identifiers
-
-
 def transform_to_spdx(license_field, classifiers):
     """Return SPDX identifiers and expression based on the found
     package license metadata (classifiers or license keyword).

tests/test_license_processor.py

@@ -1,7 +1,7 @@
 import pytest
 
 from pyp2spec.license_processor import classifiers_to_spdx_identifiers, license_keyword_to_spdx_identifiers
-from pyp2spec.license_processor import _is_compliant_with_fedora, good_for_fedora
+from pyp2spec.license_processor import _is_compliant_with_fedora
 from pyp2spec.license_processor import NoSuchClassifierError, check_compliance, generate_spdx_expression
 
 
@@ -82,21 +82,6 @@ def test_compliance_check_with_fedora(identifier, expected, fake_fedora_licenses
     assert _is_compliant_with_fedora(identifier, fake_fedora_licenses) is expected
 
 
-@pytest.mark.parametrize(
-    ("identifiers", "expected"),
-    (
-        (["AAL", "MIT", "CECILL-B"], (True, {"bad": [], "good": ["AAL", "MIT", "CECILL-B"]})),
-        ([], (False, {"bad": [], "good": []})),
-        (["LicenseRef-LPPL", "MIT"], (False, {"bad": ["LicenseRef-LPPL"], "good": ["MIT"]})),  # mixed not allowed/allowed
-        (["LicenseRef-LPPL", "Aladdin", "LicenseRef-OpenFlow", "APL-1.0"], (False, {"bad": ["LicenseRef-LPPL", "Aladdin", "LicenseRef-OpenFlow", "APL-1.0"], "good": []})),
-    ),
-)
-def test_is_allowed_in_fedora(identifiers, expected, fake_fedora_licenses):
-    """Test the function logic, bear in mind that Fedora status may change in time"""
-
-    assert good_for_fedora(identifiers, licenses_dict=fake_fedora_licenses) == expected
-
-
 def test_no_license_classifiers_and_no_license_keyword():
     classifiers = []
     license_keyword = ""
@@ -151,6 +136,10 @@ def test_license_keyword_and_classifiers():
         ("MIT AND EUPL-1.0", ["MIT"], ["EUPL-1.0"], False),
         ("RSCPL", [], ["RSCPL"], False),
         ("Fake-identifier", [], [], False),  # not a valid identifier, ergo not in "bad" list
+        ("AAL AND MIT AND CECILL-B", ["AAL", "CECILL-B", "MIT"], [], True),
+        ("", [], [], False),
+
+
     )
 )
 def test_check_compliance(license, good, bad, expected, fake_fedora_licenses):