Tidy up code somewhat

googlefonts · Oct 16, 2024 · 90fc6ca · 90fc6ca
1 parent 3b9928a
commit 90fc6ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Lib/shaperglot/cli/whatuses.py b/Lib/shaperglot/cli/whatuses.py
@@ -27,13 +27,12 @@ def whatuses(options) -> None:
     base_langs = []
     mark_langs = []
     aux_langs = []
-    for langid in langs.keys():
-        lang = langs[langid]
+    for lang in langs.values():
         exemplar_chars = lang.get("exemplarChars", {})
         marks = exemplar_chars.get("marks", "").replace("◌", "").split() or []
         bases = parse_bases(exemplar_chars.get("base", ""))
         aux = parse_bases(exemplar_chars.get("auxiliary", ""))
-        lang_key = f"{lang['name']} [{langid}]".replace(" ", "\u00A0")
+        lang_key = f"{lang['name']} [{lang['id']}]".replace(" ", "\u00A0")
         if char in bases:
             base_langs.append(lang_key)
         elif char in marks:

diff --git a/Lib/shaperglot/languages.py b/Lib/shaperglot/languages.py
@@ -70,6 +70,10 @@ def __contains__(self, item) -> bool:
     def keys(self):
         return gflangs.keys()
 
+    def values(self):
+        for k in gflangs.keys():
+            yield self.__getitem__(k)
+
     def disambiguate(self, lang):
         maybe_keys = [k for k in gflangs if k.lower().startswith(lang.lower() + "_")]
         if maybe_keys: