fonttools 4.59.2__cp311-cp311-win32.whl → 4.60.1__cp311-cp311-win32.whl

fontTools/ufoLib/kerning.py

@@ -1,6 +1,20 @@
+from __future__ import annotations
+
+from typing import Optional
+
+from fontTools.annotations import KerningPair, KerningDict, KerningGroups, IntFloat
+
+StrDict = dict[str, str]
+
+
 def lookupKerningValue(
-    pair, kerning, groups, fallback=0, glyphToFirstGroup=None, glyphToSecondGroup=None
-):
+    pair: KerningPair,
+    kerning: KerningDict,
+    groups: KerningGroups,
+    fallback: IntFloat = 0,
+    glyphToFirstGroup: Optional[StrDict] = None,
+    glyphToSecondGroup: Optional[StrDict] = None,
+) -> IntFloat:
     """Retrieve the kerning value (if any) between a pair of elements.
 
     The elments can be either individual glyphs (by name) or kerning
@@ -72,11 +86,12 @@ def lookupKerningValue(
     # quickly check to see if the pair is in the kerning dictionary
     if pair in kerning:
         return kerning[pair]
+    # ensure both or no glyph-to-group mappings are provided
+    if (glyphToFirstGroup is None) != (glyphToSecondGroup is None):
+        raise ValueError(
+            "Must provide both 'glyphToFirstGroup' and 'glyphToSecondGroup', or neither."
+        )
     # create glyph to group mapping
-    if glyphToFirstGroup is not None:
-        assert glyphToSecondGroup is not None
-    if glyphToSecondGroup is not None:
-        assert glyphToFirstGroup is not None
     if glyphToFirstGroup is None:
         glyphToFirstGroup = {}
         glyphToSecondGroup = {}
@@ -87,25 +102,30 @@ def lookupKerningValue(
             elif group.startswith("public.kern2."):
                 for glyph in groupMembers:
                     glyphToSecondGroup[glyph] = group
+    # ensure type safety for mappings
+    assert glyphToFirstGroup is not None
+    assert glyphToSecondGroup is not None
     # get group names and make sure first and second are glyph names
     first, second = pair
     firstGroup = secondGroup = None
     if first.startswith("public.kern1."):
         firstGroup = first
-        first = None
+        firstGlyph = None
     else:
         firstGroup = glyphToFirstGroup.get(first)
+        firstGlyph = first
     if second.startswith("public.kern2."):
         secondGroup = second
-        second = None
+        secondGlyph = None
     else:
         secondGroup = glyphToSecondGroup.get(second)
+        secondGlyph = second
     # make an ordered list of pairs to look up
     pairs = [
-        (first, second),
-        (first, secondGroup),
-        (firstGroup, second),
-        (firstGroup, secondGroup),
+        (a, b)
+        for a in (firstGlyph, firstGroup)
+        for b in (secondGlyph, secondGroup)
+        if a is not None and b is not None
     ]
     # look up the pairs and return any matches
     for pair in pairs:

fontTools/ufoLib/utils.py

@@ -5,14 +5,22 @@ define the :py:obj:`.deprecated` decorator that is used elsewhere in
 the module.
 """
 
-import warnings
+from __future__ import annotations
+
+from typing import Optional, Type, TypeVar, Union, cast
+from collections.abc import Callable
+import enum
 import functools
+import warnings
 
+F = TypeVar("F", bound=Callable[..., object])
+FormatVersion = TypeVar("FormatVersion", bound="BaseFormatVersion")
+FormatVersionInput = Optional[Union[int, tuple[int, int], FormatVersion]]
 
 numberTypes = (int, float)
 
 
-def deprecated(msg=""):
+def deprecated(msg: str = "") -> Callable[[F], F]:
     """Decorator factory to mark functions as deprecated with given message.
 
     >>> @deprecated("Enough!")
@@ -25,7 +33,7 @@ def deprecated(msg=""):
     True
     """
 
-    def deprecated_decorator(func):
+    def deprecated_decorator(func: F) -> F:
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
             warnings.warn(
@@ -35,41 +43,61 @@ def deprecated(msg=""):
             )
             return func(*args, **kwargs)
 
-        return wrapper
+        return cast(F, wrapper)
 
     return deprecated_decorator
 
 
-# To be mixed with enum.Enum in UFOFormatVersion and GLIFFormatVersion
-class _VersionTupleEnumMixin:
+def normalizeFormatVersion(
+    value: FormatVersionInput, cls: Type[FormatVersion]
+) -> FormatVersion:
+    # Needed for type safety of UFOFormatVersion and GLIFFormatVersion input
+    if value is None:
+        return cls.default()
+    if isinstance(value, cls):
+        return value
+    if isinstance(value, int):
+        return cls((value, 0))
+    if isinstance(value, tuple) and len(value) == 2:
+        return cls(value)
+    raise ValueError(f"Unsupported format version: {value!r}")
+
+
+# Base class for UFOFormatVersion and GLIFFormatVersion
+class BaseFormatVersion(tuple[int, int], enum.Enum):
+    value: tuple[int, int]
+
+    def __new__(cls: Type[FormatVersion], value: tuple[int, int]) -> BaseFormatVersion:
+        return super().__new__(cls, value)
+
     @property
-    def major(self):
+    def major(self) -> int:
         return self.value[0]
 
     @property
-    def minor(self):
+    def minor(self) -> int:
         return self.value[1]
 
     @classmethod
-    def _missing_(cls, value):
+    def _missing_(cls, value: object) -> BaseFormatVersion:
         # allow to initialize a version enum from a single (major) integer
         if isinstance(value, int):
             return cls((value, 0))
         # or from None to obtain the current default version
         if value is None:
             return cls.default()
-        return super()._missing_(value)
+        raise ValueError(f"{value!r} is not a valid {cls.__name__}")
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"{self.major}.{self.minor}"
 
     @classmethod
-    def default(cls):
+    def default(cls: Type[FormatVersion]) -> FormatVersion:
         # get the latest defined version (i.e. the max of all versions)
         return max(cls.__members__.values())
 
     @classmethod
-    def supported_versions(cls):
+    def supported_versions(cls: Type[FormatVersion]) -> frozenset[FormatVersion]:
         return frozenset(cls.__members__.values())