Merge pull request #1030 from carmenbianca/fix-test

Repair a broken test
fsfe · Jul 3, 2024 · e77780d · e77780d
2 parents 0ac510a + 2fc35a2
commit e77780d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/changelog.d/fixed/merge.md b/changelog.d/fixed/merge.md
@@ -0,0 +1,3 @@
+- Repaired a bug that would cause a crash when running
+  `annotate --merge-copyrights` on a file that does not yet have a year in the
+  copyright statement. This bug was introduced in v4.0.1. (#1030)
diff --git a/src/reuse/_util.py b/src/reuse/_util.py
@@ -245,13 +245,15 @@ def _determine_license_suffix_path(path: StrPath) -> Path:
     return Path(f"{path}.license")
 
 
-def _parse_copyright_year(year: str) -> list:
+def _parse_copyright_year(year: Optional[str]) -> List[str]:
     """Parse copyright years and return list."""
-    ret = []
+    ret: List[str] = []
+    if not year:
+        return ret
     if re.match(r"\d{4}$", year):
-        ret = [int(year)]
+        ret = [year]
     elif re.match(r"\d{4} ?- ?\d{4}$", year):
-        ret = [int(year[:4]), int(year[-4:])]
+        ret = [year[:4], year[-4:]]
     return ret