Merge pull request #606 from carmenbianca/deprecated-download

Support deprecated licenses for download

Author: carmenbianca

changelog.d/added/deprecated-download.md

@@ -0,0 +1 @@
+- Support deprecated licences for `reuse download`. (#606)

src/reuse/cli/download.py

@@ -15,7 +15,7 @@
 
 import click
 
-from .._licenses import ALL_NON_DEPRECATED_MAP
+from .._licenses import ALL_MAP, ALL_NON_DEPRECATED_MAP
 from .._util import _strip_plus_from_identifier
 from ..download import _path_to_license_file, put_license_in_file
 from ..i18n import _
@@ -30,9 +30,6 @@
 def _similar_spdx_identifiers(identifier: str) -> list[str]:
     """Given an incorrect SPDX identifier, return a list of similar ones."""
     suggestions: list[str] = []
-    if identifier in ALL_NON_DEPRECATED_MAP:
-        return suggestions
-
     for valid_identifier in ALL_NON_DEPRECATED_MAP:
         distance = SequenceMatcher(
             a=identifier.lower(), b=valid_identifier[: len(identifier)].lower()
@@ -87,7 +84,7 @@ def _not_found(path: StrPath) -> None:
 def _could_not_download(identifier: str) -> None:
     click.echo(_("Error: Failed to download license."))
     click.echo("")
-    if identifier not in ALL_NON_DEPRECATED_MAP:
+    if identifier not in ALL_MAP:
         _print_incorrect_spdx_identifier(identifier, out=sys.stdout)
     else:
         click.echo(_("Is your internet connection working?"))

src/reuse/download.py

@@ -14,6 +14,7 @@
 from urllib.error import URLError
 from urllib.parse import urljoin
 
+from ._licenses import ALL_NON_DEPRECATED_MAP
 from ._util import find_licenses_directory
 from .extract import _LICENSEREF_PATTERN
 from .project import Project
@@ -40,6 +41,8 @@ def download_license(spdx_identifier: str) -> str:
     Returns:
         The license text.
     """
+    if spdx_identifier not in ALL_NON_DEPRECATED_MAP:
+        spdx_identifier = f"deprecated_{spdx_identifier}"
     # This is fairly naive, but I can't see anything wrong with it.
     url = urljoin(_SPDX_REPOSITORY_BASE_URL, "".join((spdx_identifier, ".txt")))
     _LOGGER.debug("downloading license from '%s'", url)

tests/test_download.py

@@ -6,6 +6,7 @@
 
 import urllib.request
 from pathlib import Path
+from unittest.mock import MagicMock
 from urllib.error import URLError
 
 import pytest
@@ -62,6 +63,14 @@ def raise_exception(_):
         download_license("hello world")
 
 
+def test_download_deprecated(monkeypatch):
+    """Adjust the requested file for deprecated licenses."""
+    mocked = MagicMock(return_value=MockResponse("hello", 200))
+    monkeypatch.setattr(urllib.request, "urlopen", mocked)
+    download_license("GPL-3.0")
+    assert "deprecated_GPL-3.0" in mocked.call_args[0][0]
+
+
 def test_put_simple(fake_repository, monkeypatch):
     """Straightforward test."""
     monkeypatch.setattr(