fonttools 4.57.0__cp39-cp39-macosx_10_9_universal2.whl → 4.58.1__cp39-cp39-macosx_10_9_universal2.whl

fontTools/misc/etree.py

@@ -56,21 +56,7 @@ except ImportError:
         from xml.etree.ElementTree import *
     _have_lxml = False
 
-    import sys
-
-    # dict is always ordered in python >= 3.6 and on pypy
-    PY36 = sys.version_info >= (3, 6)
-    try:
-        import __pypy__
-    except ImportError:
-        __pypy__ = None
-    _dict_is_ordered = bool(PY36 or __pypy__)
-    del PY36, __pypy__
-
-    if _dict_is_ordered:
-        _Attrib = dict
-    else:
-        from collections import OrderedDict as _Attrib
+    _Attrib = dict
 
     if isinstance(Element, type):
         _Element = Element
@@ -221,18 +207,9 @@ except ImportError:
     # characters, the surrogate blocks, FFFE, and FFFF:
     #   Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
     # Here we reversed the pattern to match only the invalid characters.
-    # For the 'narrow' python builds supporting only UCS-2, which represent
-    # characters beyond BMP as UTF-16 surrogate pairs, we need to pass through
-    # the surrogate block. I haven't found a more elegant solution...
-    UCS2 = sys.maxunicode < 0x10FFFF
-    if UCS2:
-        _invalid_xml_string = re.compile(
-            "[\u0000-\u0008\u000B-\u000C\u000E-\u001F\uFFFE-\uFFFF]"
-        )
-    else:
-        _invalid_xml_string = re.compile(
-            "[\u0000-\u0008\u000B-\u000C\u000E-\u001F\uD800-\uDFFF\uFFFE-\uFFFF]"
-        )
+    _invalid_xml_string = re.compile(
+        "[\u0000-\u0008\u000B-\u000C\u000E-\u001F\uD800-\uDFFF\uFFFE-\uFFFF]"
+    )
 
     def _tounicode(s):
         """Test if a string is valid user input and decode it to unicode string

fontTools/misc/loggingTools.py

@@ -284,7 +284,7 @@ class Timer(object):
     """
 
     # timeit.default_timer choses the most accurate clock for each platform
-    _time = timeit.default_timer
+    _time: Callable[[], float] = staticmethod(timeit.default_timer)
     default_msg = "elapsed time: %(time).3fs"
     default_format = "Took %(time).3fs to %(msg)s"
 

fontTools/misc/symfont.py

@@ -234,11 +234,9 @@ if __name__ == '__main__':
 
 
 if __name__ == "__main__":
-    pen = AreaPen()
-    pen.moveTo((100, 100))
-    pen.lineTo((100, 200))
-    pen.lineTo((200, 200))
-    pen.curveTo((200, 250), (300, 300), (250, 350))
-    pen.lineTo((200, 100))
-    pen.closePath()
-    print(pen.value)
+    import sys
+
+    if sys.argv[1:]:
+        penName = sys.argv[1]
+        funcs = [(name, eval(f)) for name, f in zip(sys.argv[2::2], sys.argv[3::2])]
+        printGreenPen(penName, funcs, file=sys.stdout)

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__()