Merge pull request #63 from source-foundry/style

Refactor stdout reporting function, formatting

Author: chrissimpkins

lib/dehinter/__main__.py

@@ -20,8 +20,7 @@
 from fontTools.ttLib import TTFont  # type: ignore
 
 from dehinter import __version__
-from dehinter.font import (dehint,
-                           is_truetype_font)
+from dehinter.font import dehint, is_truetype_font
 from dehinter.paths import filepath_exists, get_default_out_path
 from dehinter.system import get_filesize
 
@@ -106,20 +105,22 @@ def run(argv: List[str]) -> None:
         )
         sys.exit(1)
 
-    dehint(tt,
-           keep_cvar=args.keep_cvar,
-           keep_cvt=args.keep_cvt,
-           keep_fpgm=args.keep_fpgm,
-           keep_gasp=args.keep_gasp,
-           keep_glyf=args.keep_glyf,
-           keep_hdmx=args.keep_hdmx,
-           keep_head=args.keep_head,
-           keep_ltsh=args.keep_ltsh,
-           keep_maxp=args.keep_maxp,
-           keep_prep=args.keep_prep,
-           keep_ttfa=args.keep_ttfa,
-           keep_vdmx=args.keep_vdmx,
-           verbose=True)
+    dehint(
+        tt,
+        keep_cvar=args.keep_cvar,
+        keep_cvt=args.keep_cvt,
+        keep_fpgm=args.keep_fpgm,
+        keep_gasp=args.keep_gasp,
+        keep_glyf=args.keep_glyf,
+        keep_hdmx=args.keep_hdmx,
+        keep_head=args.keep_head,
+        keep_ltsh=args.keep_ltsh,
+        keep_maxp=args.keep_maxp,
+        keep_prep=args.keep_prep,
+        keep_ttfa=args.keep_ttfa,
+        keep_vdmx=args.keep_vdmx,
+        verbose=True,
+    )
 
     # File write
     # ----------

lib/dehinter/font.py

@@ -26,78 +26,82 @@
 pp = pprint.PrettyPrinter(indent=4)
 
 
+def _report_actions(table, has_table):
+    if not has_table:
+        print(f"[-] Removed {table} table")
+    else:  # pragma: no cover
+        sys.stderr.write(
+            f"[!] Error: failed to remove {table} table from font{os.linesep}"
+        )
+
+
 # ========================================================
 # Core dehinting routine
 # ========================================================
-def dehint(tt,
-           keep_cvar=False,
-           keep_cvt=False,
-           keep_fpgm=False,
-           keep_gasp=False,
-           keep_glyf=False,
-           keep_hdmx=False,
-           keep_head=False,
-           keep_ltsh=False,
-           keep_maxp=False,
-           keep_prep=False,
-           keep_ttfa=False,
-           keep_vdmx=False,
-           verbose=True):
-    def report_actions(table, has_table):
-        if not has_table:
-            print(f"[-] Removed {table} table")
-        else:  # pragma: no cover
-            sys.stderr.write(
-                f"[!] Error: failed to remove {table} table from font{os.linesep}"
-            )
+def dehint(
+    tt,
+    keep_cvar=False,
+    keep_cvt=False,
+    keep_fpgm=False,
+    keep_gasp=False,
+    keep_glyf=False,
+    keep_hdmx=False,
+    keep_head=False,
+    keep_ltsh=False,
+    keep_maxp=False,
+    keep_prep=False,
+    keep_ttfa=False,
+    keep_vdmx=False,
+    verbose=True,
+):
 
     if is_variable_font(tt) and not keep_cvar:
         if has_cvar_table(tt):
             remove_cvar_table(tt)
             if verbose:
-                report_actions("cvar", has_cvar_table(tt))
+                _report_actions("cvar", has_cvar_table(tt))
 
     if not keep_cvt:
         if has_cvt_table(tt):
             remove_cvt_table(tt)
             if verbose:
-                report_actions("cvt", has_cvt_table(tt))
+                _report_actions("cvt", has_cvt_table(tt))
 
     if not keep_fpgm:
         if has_fpgm_table(tt):
             remove_fpgm_table(tt)
             if verbose:
-                report_actions("fpgm", has_fpgm_table(tt))
+                _report_actions("fpgm", has_fpgm_table(tt))
 
     if not keep_hdmx:
         if has_hdmx_table(tt):
             remove_hdmx_table(tt)
             if verbose:
-                report_actions("hdmx", has_hdmx_table(tt))
+                _report_actions("hdmx", has_hdmx_table(tt))
 
     if not keep_ltsh:
         if has_ltsh_table(tt):
             remove_ltsh_table(tt)
             if verbose:
-                report_actions("LTSH", has_ltsh_table(tt))
+                _report_actions("LTSH", has_ltsh_table(tt))
 
     if not keep_prep:
         if has_prep_table(tt):
             remove_prep_table(tt)
             if verbose:
-                report_actions("prep", has_prep_table(tt))
+                _report_actions("prep", has_prep_table(tt))
 
     if not keep_ttfa:
         if has_ttfa_table(tt):
             remove_ttfa_table(tt)
             if verbose:
-                report_actions("ttfa", has_ttfa_table(tt))
+                _report_actions("ttfa", has_ttfa_table(tt))
 
     if not keep_vdmx:
         if has_vdmx_table(tt):
             remove_vdmx_table(tt)
             if verbose:
-                report_actions("VDMX", has_vdmx_table(tt))
+                _report_actions("VDMX", has_vdmx_table(tt))
 
     #  (2) Remove glyf table instruction set bytecode
     if not keep_glyf: