Migrate from iso-639 to iso639-lang library, former one is not maintained anymore

Author: benoit74

Diff for: pyproject.toml

@@ -8,7 +8,7 @@ requires-python = ">=3.8,<3.13"
 description = "Collection of python tools to re-use common code across scrapers"
 readme = "README.md"
 dependencies = [
-  "iso-639==0.4.5",
+  "iso639-lang==2.2.3",
   "requests==2.31.0",
   "colorthief==0.2.1",
   "python-resize-image==1.1.20",

Diff for: src/zimscraperlib/i18n.py

@@ -8,7 +8,8 @@
 from typing import Dict, Optional, Tuple, Union
 
 import babel
-from iso639 import languages as iso639_languages
+import iso639
+import iso639.exceptions
 
 ISO_LEVELS = ["1", "2b", "2t", "3", "5"]
 
@@ -67,27 +68,42 @@ def get_iso_lang_data(lang: str) -> Tuple[Dict, Union[Dict, None]]:
 
     iso_types = []
 
-    for code_type in [f"part{lang_}" for lang_ in ISO_LEVELS] + ["name"]:
-        try:
-            iso639_languages.get(**{code_type: lang})
-            iso_types.append(code_type)
-        except KeyError:
-            pass
-
-    if not iso_types:
-        raise NotFound("Not a valid iso language name/code")
-
-    language = iso639_languages.get(**{iso_types[0]: lang})
+    try:
+        isolang = iso639.Lang(lang)
+    except iso639.exceptions.InvalidLanguageValue as exc:
+        raise NotFound("Not a valid iso language name/code") from exc
+
+    def replace_types(new_type: str) -> str:
+        # convert new iso_types from iso639-lang Pypi package to old iso_types from
+        # iso-639 package, since we were returning these values for a long time
+        if new_type == "pt1":
+            return "part1"
+        elif new_type == "pt2b":
+            return "part2b"
+        elif new_type == "pt2t":
+            return "part2t"
+        elif new_type == "pt3":
+            return "part3"
+        elif new_type == "pt5":
+            return "part5"
+        return new_type
+
+    for code_type in [f"pt{lang_}" for lang_ in ISO_LEVELS] + ["name"]:
+        # the `if` condition below is a bit hackish but it is the only way to know
+        # if the passed value is matching a code type or not with new python-i639
+        # library and we do not expect weird things to happen here
+        if str(getattr(isolang, code_type)).lower() == lang.lower():
+            iso_types.append(replace_types(code_type))
 
     lang_data = {
-        f"iso-639-{lang_}": getattr(language, f"part{lang_}") for lang_ in ISO_LEVELS
+        f"iso-639-{lang_}": getattr(isolang, f"pt{lang_}") for lang_ in ISO_LEVELS
     }
-    lang_data.update({"english": language.name, "iso_types": iso_types})
+    lang_data.update({"english": isolang.name, "iso_types": iso_types})
 
-    if language.macro:
+    if isolang.macro():
         return (
             lang_data,
-            get_iso_lang_data(language.macro)[0],
+            get_iso_lang_data(isolang.macro().name)[0],
         )  # first item in the returned tuple
     return lang_data, None
 

Diff for: tests/i18n/test_i18n.py

@@ -96,11 +96,11 @@ def test_selocale_unsupported(tmp_path):
             {
                 "iso-639-1": "",
                 "iso-639-2b": "afa",
-                "iso-639-2t": "afa",
+                "iso-639-2t": "",
                 "iso-639-3": "",
                 "iso-639-5": "afa",
                 "english": "Afro-Asiatic languages",
-                "iso_types": ["part2b", "part2t", "part5"],
+                "iso_types": ["part2b", "part5"],
                 "querytype": "purecode",
                 "query": "afa",
                 "native": "Afro-Asiatic languages",
@@ -111,7 +111,7 @@ def test_selocale_unsupported(tmp_path):
             {
                 "iso-639-1": "",
                 "iso-639-2b": "afa",
-                "iso-639-2t": "afa",
+                "iso-639-2t": "",
                 "iso-639-3": "",
                 "iso-639-5": "afa",
                 "english": "Afro-Asiatic languages",