fonttools 4.55.4__cp313-cp313-musllinux_1_2_aarch64.whl → 4.61.1__cp313-cp313-musllinux_1_2_aarch64.whl

fontTools/misc/visitor.py

@@ -1,11 +1,19 @@
 """Generic visitor pattern implementation for Python objects."""
 
 import enum
+import weakref
 
 
 class Visitor(object):
     defaultStop = False
 
+    _visitors = {
+        # By default we skip visiting weak references to avoid recursion
+        # issues. Users can override this by registering a visit
+        # function for weakref.ProxyType.
+        weakref.ProxyType: {None: lambda self, obj, *args, **kwargs: False}
+    }
+
     @classmethod
     def _register(celf, clazzes_attrs):
         assert celf != Visitor, "Subclass Visitor instead."
@@ -71,12 +79,15 @@ class Visitor(object):
     def visitObject(self, obj, *args, **kwargs):
         """Called to visit an object. This function loops over all non-private
         attributes of the objects and calls any user-registered (via
-        @register_attr() or @register_attrs()) visit() functions.
+        ``@register_attr()`` or ``@register_attrs()``) ``visit()`` functions.
+
+        The visitor will proceed to call ``self.visitAttr()``, unless there is a
+        user-registered visit function and:
 
-        If there is no user-registered visit function, of if there is and it
-        returns True, or it returns None (or doesn't return anything) and
-        visitor.defaultStop is False (default), then the visitor will proceed
-        to call self.visitAttr()"""
+        * It returns ``False``; or
+        * It returns ``None`` (or doesn't return anything) and
+          ``visitor.defaultStop`` is ``True`` (non-default).
+        """
 
         keys = sorted(vars(obj).keys())
         _visitors = self._visitorsFor(obj)
@@ -113,19 +124,24 @@ class Visitor(object):
 
     def visit(self, obj, *args, **kwargs):
         """This is the main entry to the visitor. The visitor will visit object
-        obj.
+        ``obj``.
 
         The visitor will first determine if there is a registered (via
-        @register()) visit function for the type of object. If there is, it
-        will be called, and (visitor, obj, *args, **kwargs) will be passed to
-        the user visit function.
-
-        If there is no user-registered visit function, of if there is and it
-        returns True, or it returns None (or doesn't return anything) and
-        visitor.defaultStop is False (default), then the visitor will proceed
-        to dispatch to one of self.visitObject(), self.visitList(),
-        self.visitDict(), or self.visitLeaf() (any of which can be overriden in
-        a subclass)."""
+        ``@register()``) visit function for the type of object. If there is, it
+        will be called, and ``(visitor, obj, *args, **kwargs)`` will be passed
+        to the user visit function.
+
+        The visitor will not recurse if there is a user-registered visit
+        function and:
+
+        * It returns ``False``; or
+        * It returns ``None`` (or doesn't return anything) and
+          ``visitor.defaultStop`` is ``True`` (non-default)
+
+        Otherwise,  the visitor will proceed to dispatch to one of
+        ``self.visitObject()``, ``self.visitList()``, ``self.visitDict()``, or
+        ``self.visitLeaf()`` (any of which can be overriden in a subclass).
+        """
 
         visitorFunc = self._visitorsFor(obj).get(None, None)
         if visitorFunc is not None:

fontTools/misc/xmlWriter.py

@@ -1,27 +1,49 @@
 """xmlWriter.py -- Simple XML authoring class"""
 
+from __future__ import annotations
+
+from typing import BinaryIO, Callable, TextIO
 from fontTools.misc.textTools import byteord, strjoin, tobytes, tostr
 import sys
 import os
 import string
+import logging
+import itertools
 
 INDENT = "  "
+TTX_LOG = logging.getLogger("fontTools.ttx")
+REPLACEMENT = "?"
+ILLEGAL_XML_CHARS = dict.fromkeys(
+    itertools.chain(
+        range(0x00, 0x09),
+        (0x0B, 0x0C),
+        range(0x0E, 0x20),
+        range(0xD800, 0xE000),
+        (0xFFFE, 0xFFFF),
+    ),
+    REPLACEMENT,
+)
 
 
 class XMLWriter(object):
     def __init__(
         self,
-        fileOrPath,
-        indentwhite=INDENT,
-        idlefunc=None,
-        encoding="utf_8",
-        newlinestr="\n",
-    ):
+        fileOrPath: str | os.PathLike[str] | BinaryIO | TextIO,
+        indentwhite: str = INDENT,
+        idlefunc: Callable[[], None] | None = None,
+        encoding: str = "utf_8",
+        newlinestr: str | bytes = "\n",
+    ) -> None:
         if encoding.lower().replace("-", "").replace("_", "") != "utf8":
             raise Exception("Only UTF-8 encoding is supported.")
         if fileOrPath == "-":
             fileOrPath = sys.stdout
+        self.filename: str | os.PathLike[str] | None
         if not hasattr(fileOrPath, "write"):
+            if not isinstance(fileOrPath, (str, os.PathLike)):
+                raise TypeError(
+                    "fileOrPath must be a file path (str or PathLike) if it isn't an object with a `write` method."
+                )
             self.filename = fileOrPath
             self.file = open(fileOrPath, "wb")
             self._closeStream = True
@@ -60,8 +82,9 @@ class XMLWriter(object):
     def __exit__(self, exception_type, exception_value, traceback):
         self.close()
 
-    def close(self):
+    def close(self) -> None:
         if self._closeStream:
+            assert not isinstance(self.file, (str, os.PathLike))
             self.file.close()
 
     def write(self, string, indent=True):
@@ -168,12 +191,25 @@ class XMLWriter(object):
 
 
 def escape(data):
+    """Escape characters not allowed in `XML 1.0 <https://www.w3.org/TR/xml/#NT-Char>`_."""
     data = tostr(data, "utf_8")
     data = data.replace("&", "&amp;")
     data = data.replace("<", "&lt;")
     data = data.replace(">", "&gt;")
     data = data.replace("\r", "&#13;")
-    return data
+
+    newData = data.translate(ILLEGAL_XML_CHARS)
+    if newData != data:
+        maxLen = 10
+        preview = repr(data)
+        if len(data) > maxLen:
+            preview = repr(data[:maxLen])[1:-1] + "..."
+        TTX_LOG.warning(
+            "Illegal XML character(s) found; replacing offending string %r with %r",
+            preview,
+            REPLACEMENT,
+        )
+    return newData
 
 
 def escapeattr(data):

fontTools/mtiLib/__init__.py

@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 # FontDame-to-FontTools for OpenType Layout tables
 #
 # Source language spec is available at:
@@ -1377,7 +1375,7 @@ def main(args=None, font=None):
 
     for f in args.inputs:
         log.debug("Processing %s", f)
-        with open(f, "rt", encoding="utf-8") as f:
+        with open(f, "rt", encoding="utf-8-sig") as f:
             table = build(f, font, tableTag=args.tableTag)
         blob = table.compile(font)  # Make sure it compiles
         decompiled = table.__class__()