Use as_file context correctly

Author: jenskutilek

Lib/fontbakery/checks/vendorspecific/googlefonts/conditions.py

@@ -307,18 +307,19 @@ def rfn_exception(font):
     been published previously with an RFN, or fonts which benefit from
     an agreement with Google Fonts.
     """
-    from fontbakery.utils import get_resource_file_path
+    from importlib.resources import as_file, files
 
     rfn_exceptions_txt = "data/googlefonts/reserved_font_name_exceptions.txt"
-    filename = get_resource_file_path(rfn_exceptions_txt)
-    for exception in open(filename, "r", encoding="utf-8").readlines():
-        exception = exception.split("#")[0].strip()
-        exception = exception.replace(" ", "")
-        if exception == "":
-            continue
-
-        if exception in font.familyname:
-            return True
+    with as_file(files("fontbakery").joinpath(rfn_exceptions_txt)) as filename:
+        with open(filename, "r", encoding="utf-8") as f:
+            for exception in f.readlines():
+                exception = exception.split("#")[0].strip()
+                exception = exception.replace(" ", "")
+                if exception == "":
+                    continue
+
+                if exception in font.familyname:
+                    return True
 
 
 @condition(Font)

Lib/fontbakery/checks/vendorspecific/googlefonts/family_name_compliance.py

@@ -25,8 +25,9 @@
 def check_family_name_compliance(ttFont):
     """Check family name for GF Guide compliance."""
     import re
+    from importlib.resources import as_file, files
 
-    from fontbakery.utils import get_name_entries, get_resource_file_path
+    from fontbakery.utils import get_name_entries
 
     camelcase_exceptions_txt = "data/googlefonts/camelcased_familyname_exceptions.txt"
     abbreviations_exceptions_txt = (
@@ -45,18 +46,21 @@ def check_family_name_compliance(ttFont):
         known_exception = False
 
         # Process exceptions
-        filename = get_resource_file_path(camelcase_exceptions_txt)
-        for exception in open(filename, "r", encoding="utf-8").readlines():
-            exception = exception.split("#")[0].strip()
-            if exception == "":
-                continue
-            if exception in family_name:
-                known_exception = True
-                yield PASS, Message(
-                    "known-camelcase-exception",
-                    "Family name is a known exception to the CamelCase rule.",
-                )
-                break
+        with as_file(
+            files("fontbakery").joinpath(camelcase_exceptions_txt)
+        ) as filename:
+            with open(filename, "r", encoding="utf-8") as f:
+                for exception in f.readlines():
+                    exception = exception.split("#")[0].strip()
+                    if exception == "":
+                        continue
+                    if exception in family_name:
+                        known_exception = True
+                        yield PASS, Message(
+                            "known-camelcase-exception",
+                            "Family name is a known exception to the CamelCase rule.",
+                        )
+                        break
 
         if not known_exception:
             yield FAIL, Message(
@@ -71,18 +75,21 @@ def check_family_name_compliance(ttFont):
         known_exception = False
 
         # Process exceptions
-        filename = get_resource_file_path(abbreviations_exceptions_txt)
-        for exception in open(filename, "r", encoding="utf-8").readlines():
-            exception = exception.split("#")[0].strip()
-            if exception == "":
-                continue
-            if exception in family_name:
-                known_exception = True
-                yield PASS, Message(
-                    "known-abbreviation-exception",
-                    "Family name is a known exception to the abbreviation rule.",
-                )
-                break
+        with as_file(
+            files("fontbakery").joinpath(abbreviations_exceptions_txt)
+        ) as filename:
+            with open(filename, "r", encoding="utf-8") as f:
+                for exception in f.readlines():
+                    exception = exception.split("#")[0].strip()
+                    if exception == "":
+                        continue
+                    if exception in family_name:
+                        known_exception = True
+                        yield  PASS, Message(
+                            "known-abbreviation-exception",
+                            "Family name is a known exception to the abbreviation rule.",
+                        )
+                        break
 
         if not known_exception:
             # Allow SC ending

Lib/fontbakery/checks/vendorspecific/googlefonts/utils.py

@@ -1,7 +1,7 @@
 import re
 from functools import lru_cache
+from importlib.resources import as_file, files
 
-from fontbakery.utils import exit_with_install_instructions, get_resource_file_path
 
 
 @lru_cache(maxsize=1)
@@ -21,8 +21,11 @@ def registered_vendor_ids():
         exit_with_install_instructions("googlefonts")
 
     registered_vendor_ids = {}
-    CACHED = get_resource_file_path("data/fontbakery-microsoft-vendorlist.cache")
-    content = open(CACHED, encoding="utf-8").read()
+    with as_file(
+        files("fontbakery").joinpath("data/fontbakery-microsoft-vendorlist.cache")
+    ) as CACHED:
+        with open(CACHED, encoding="utf-8") as f:
+            content = f.read()
     # Strip all <A> HTML tags from the raw HTML. The current page contains a
     # closing </A> for which no opening <A> is present, which causes
     # beautifulsoup to silently stop processing that section from the error

Lib/fontbakery/utils.py

@@ -20,7 +20,7 @@
 import sys
 import traceback
 from copy import deepcopy
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from fontTools.pens.basePen import BasePen
 from fontTools.ttLib import TTFont
@@ -33,27 +33,6 @@
     PANOSE_Family_Type,
 )
 
-if TYPE_CHECKING:
-    from pathlib import Path
-
-
-def get_resource_file_path(sub_file_path: str) -> Path:
-    """Return the full file path of a resource file inside the fontbakery
-    directory.
-
-    Args:
-        sub_file_path (str): The file path relative to the `fontbakery`
-            directory.
-
-    Returns:
-        Path: The full file path
-    """
-    from importlib.resources import as_file, files
-
-    with as_file(files("fontbakery").joinpath(sub_file_path)) as path:
-        file_path = path
-    return file_path
-
 
 def exit_with_install_instructions(profile_name):
     sys.exit(