Merge pull request #110 from abompard/strip-order

Strip return carriages before running `.endswith()`

Author: ochedru

liccheck/command_line.py

@@ -147,10 +147,10 @@ def get_packages_info(requirement_file, no_deps=False):
 
     def transform(dist):
         licenses = get_licenses_from_classifiers(dist) or get_license(dist) or []
-        # Strip the useless "License" suffix and uniquify
-        licenses = list(set([strip_license(l) for l in licenses]))
         # Removing Trailing windows generated \r
         licenses = list(set([strip_license_for_windows(l) for l in licenses]))
+        # Strip the useless "License" suffix and uniquify
+        licenses = list(set([strip_license(l) for l in licenses]))
 
         return {
             "name": dist.project_name,

tests/test_get_packages_info.py

@@ -1,5 +1,6 @@
 import sys
 
+import pkg_resources
 import pytest
 
 from liccheck.command_line import get_packages_info
@@ -12,6 +13,24 @@ def test_license_strip(tmpfile):
     assert get_packages_info(tmppath)[0]["licenses"] == ["MIT"]
 
 
+def test_license_strip_with_return_carriage(tmp_path, mocker):
+    resolve = mocker.patch("liccheck.command_line.resolve")
+    req_path = tmp_path.joinpath("requirements.txt").as_posix()
+    with open(req_path, "w") as tmpfh:
+        tmpfh.write("pip\n")
+    pkg_info_path = tmp_path.joinpath("PKG-INFO").as_posix()
+    with open(pkg_info_path, "wb") as tmpfh:
+        tmpfh.write(b"Metadata-Version: 2.1\r\n")
+        tmpfh.write(b"Name: pip\r\n")
+        tmpfh.write(b"Version: 23.3.1\r\n")
+        tmpfh.write(b"Classifier: License :: OSI Approved :: MIT License\r\n")
+    metadata = pkg_resources.PathMetadata(tmp_path, tmp_path)
+    resolve.return_value = [
+        pkg_resources.Distribution(project_name="pip", metadata=metadata)
+    ]
+    assert get_packages_info(req_path)[0]["licenses"] == ["MIT"]
+
+
 def test_requirements_markers(tmpfile):
     tmpfh, tmppath = tmpfile
     tmpfh.write(