Misc py23 cleanups (#2243)

* Replaced all from ...py23 import * with explicit name imports, or removed completely when possible.
* Replaced tounicode() with tostr()
* Changed all BytesIO ans StringIO imports to from io import ..., replaced all UnicodeIO with StringIO.
* Replaced all unichr() with chr()
* Misc minor tweaks and fixes

Doc/source/ttx.rst

@@ -35,14 +35,14 @@ The TTX file format
 
 The following tables are currently supported::
 
-    BASE, CBDT, CBLC, CFF, CFF2, COLR, CPAL, DSIG, EBDT, EBLC, FFTM,
-    Feat, GDEF, GMAP, GPKG, GPOS, GSUB, Glat, Gloc, HVAR, JSTF, LTSH,
-    MATH, META, MVAR, OS/2, SING, STAT, SVG, Silf, Sill, TSI0, TSI1,
-    TSI2, TSI3, TSI5, TSIB, TSIC, TSID, TSIJ, TSIP, TSIS, TSIV, TTFA,
-    VDMX, VORG, VVAR, ankr, avar, bsln, cidg, cmap, cvar, cvt, feat,
-    fpgm, fvar, gasp, gcid, glyf, gvar, hdmx, head, hhea, hmtx, kern,
-    lcar, loca, ltag, maxp, meta, mort, morx, name, opbd, post, prep,
-    prop, sbix, trak, vhea and vmtx
+    BASE, CBDT, CBLC, CFF, CFF2, COLR, CPAL, DSIG, Debg, EBDT, EBLC,
+    FFTM, Feat, GDEF, GMAP, GPKG, GPOS, GSUB, Glat, Gloc, HVAR, JSTF,
+    LTSH, MATH, META, MVAR, OS/2, SING, STAT, SVG, Silf, Sill, TSI0,
+    TSI1, TSI2, TSI3, TSI5, TSIB, TSIC, TSID, TSIJ, TSIP, TSIS, TSIV,
+    TTFA, VDMX, VORG, VVAR, ankr, avar, bsln, cidg, cmap, cvar, cvt,
+    feat, fpgm, fvar, gasp, gcid, glyf, gvar, hdmx, head, hhea, hmtx,
+    kern, lcar, loca, ltag, maxp, meta, mort, morx, name, opbd, post,
+    prep, prop, sbix, trak, vhea and vmtx
 
 .. end table list
 

Lib/fontTools/__init__.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 import logging
 from fontTools.misc.loggingTools import configLogger
 

Lib/fontTools/afmLib.py

@@ -46,7 +46,6 @@ Here is an example of using `afmLib` to read, modify and write an AFM file:
 """
 
 
-from fontTools.misc.py23 import *
 import re
 
 # every single line starts with a "word"

Lib/fontTools/agl.py

@@ -26,7 +26,7 @@ This is used by fontTools when it has to construct glyph names for a font which
 doesn't include any (e.g. format 3.0 post tables).
 """
 
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import tostr
 import re
 
 
@@ -5140,7 +5140,7 @@ def _glyphComponentToUnicode(component, isZapfDingbats):
 	# to the corresponding character in that list.
 	uchars = LEGACY_AGL2UV.get(component)
 	if uchars:
-		return "".join(map(unichr, uchars))
+		return "".join(map(chr, uchars))
 
 	# Otherwise, if the component is of the form "uni" (U+0075,
 	# U+006E, and U+0069) followed by a sequence of uppercase
@@ -5210,7 +5210,7 @@ def _uniToUnicode(component):
 	if any(c >= 0xD800 and c <= 0xDFFF for c in chars):
 		# The AGL specification explicitly excluded surrogate pairs.
 		return None
-	return ''.join([unichr(c) for c in chars])
+	return ''.join([chr(c) for c in chars])
 
 
 _re_u = re.compile("^u([0-9A-F]{4,6})$")
@@ -5228,5 +5228,5 @@ def _uToUnicode(component):
 		return None
 	if ((value >= 0x0000 and value <= 0xD7FF) or
 	    (value >= 0xE000 and value <= 0x10FFFF)):
-		return unichr(value)
+		return chr(value)
 	return None

Lib/fontTools/cffLib/__init__.py

@@ -11,7 +11,7 @@ the demands of variable fonts. This module parses both original CFF and CFF2.
 
 """
 
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytechr, byteord, bytesjoin, tobytes, tostr
 from fontTools.misc import sstruct
 from fontTools.misc import psCharStrings
 from fontTools.misc.arrayTools import unionRect, intRect
@@ -20,6 +20,7 @@ from fontTools.ttLib import TTFont
 from fontTools.ttLib.tables.otBase import OTTableWriter
 from fontTools.ttLib.tables.otBase import OTTableReader
 from fontTools.ttLib.tables import otTables as ot
+from io import BytesIO
 import struct
 import logging
 import re
@@ -1245,7 +1246,7 @@ class ASCIIConverter(SimpleConverter):
 		return tobytes(value, encoding='ascii')
 
 	def xmlWrite(self, xmlWriter, name, value):
-		xmlWriter.simpletag(name, value=tounicode(value, encoding="ascii"))
+		xmlWriter.simpletag(name, value=tostr(value, encoding="ascii"))
 		xmlWriter.newline()
 
 	def xmlRead(self, name, attrs, content, parent):
@@ -1261,7 +1262,7 @@ class Latin1Converter(SimpleConverter):
 		return tobytes(value, encoding='latin1')
 
 	def xmlWrite(self, xmlWriter, name, value):
-		value = tounicode(value, encoding="latin1")
+		value = tostr(value, encoding="latin1")
 		if name in ['Notice', 'Copyright']:
 			value = re.sub(r"[\r\n]\s+", " ", value)
 		xmlWriter.simpletag(name, value=value)

Lib/fontTools/cffLib/specializer.py

@@ -13,7 +13,6 @@ and specific forms of the operation.
 
 """
 
-from fontTools.misc.py23 import *
 from fontTools.cffLib import maxStackLimit
 
 

Lib/fontTools/cffLib/width.py

@@ -7,11 +7,10 @@ value do not need to specify their width in their charstring, saving bytes.
 This module determines the optimum ``defaultWidthX`` and ``nominalWidthX``
 values for a font, when provided with a list of glyph widths."""
 
-from fontTools.misc.py23 import *
-from fontTools.ttLib import TTFont, getTableClass
+from fontTools.ttLib import TTFont
 from collections import defaultdict
 from operator import add
-from functools import partial, reduce
+from functools import reduce
 
 
 class missingdict(dict):

Lib/fontTools/designspaceLib/__init__.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import tobytes, tostr
 from fontTools.misc.loggingTools import LogMixin
 import collections
+from io import BytesIO, StringIO
 import os
 import posixpath
 from fontTools.misc import etree as ET
@@ -290,25 +291,25 @@ class InstanceDescriptor(SimpleDescriptor):
     filename = posixpath_property("_filename")
 
     def setStyleName(self, styleName, languageCode="en"):
-        self.localisedStyleName[languageCode] = tounicode(styleName)
+        self.localisedStyleName[languageCode] = tostr(styleName)
 
     def getStyleName(self, languageCode="en"):
         return self.localisedStyleName.get(languageCode)
 
     def setFamilyName(self, familyName, languageCode="en"):
-        self.localisedFamilyName[languageCode] = tounicode(familyName)
+        self.localisedFamilyName[languageCode] = tostr(familyName)
 
     def getFamilyName(self, languageCode="en"):
         return self.localisedFamilyName.get(languageCode)
 
     def setStyleMapStyleName(self, styleMapStyleName, languageCode="en"):
-        self.localisedStyleMapStyleName[languageCode] = tounicode(styleMapStyleName)
+        self.localisedStyleMapStyleName[languageCode] = tostr(styleMapStyleName)
 
     def getStyleMapStyleName(self, languageCode="en"):
         return self.localisedStyleMapStyleName.get(languageCode)
 
     def setStyleMapFamilyName(self, styleMapFamilyName, languageCode="en"):
-        self.localisedStyleMapFamilyName[languageCode] = tounicode(styleMapFamilyName)
+        self.localisedStyleMapFamilyName[languageCode] = tostr(styleMapFamilyName)
 
     def getStyleMapFamilyName(self, languageCode="en"):
         return self.localisedStyleMapFamilyName.get(languageCode)
@@ -823,7 +824,7 @@ class BaseDocReader(LogMixin):
                 # '{http://www.w3.org/XML/1998/namespace}lang'
                 for key, lang in labelNameElement.items():
                     if key == XML_LANG:
-                        axisObject.labelNames[lang] = tounicode(labelNameElement.text)
+                        axisObject.labelNames[lang] = tostr(labelNameElement.text)
             self.documentObject.axes.append(axisObject)
             self.axisDefaults[axisObject.name] = axisObject.default
 
@@ -1099,10 +1100,10 @@ class DesignSpaceDocument(LogMixin, AsDictMixin):
         return self
 
     def tostring(self, encoding=None):
-        if encoding is unicode or (
+        if encoding is str or (
             encoding is not None and encoding.lower() == "unicode"
         ):
-            f = UnicodeIO()
+            f = StringIO()
             xml_declaration = False
         elif encoding is None or encoding == "utf-8":
             f = BytesIO()

Lib/fontTools/encodings/MacRoman.py

@@ -1,5 +1,3 @@
-from fontTools.misc.py23 import *
-
 MacRoman = [
 		'NUL', 'Eth', 'eth', 'Lslash', 'lslash', 'Scaron', 'scaron', 'Yacute',
 		'yacute', 'HT', 'LF', 'Thorn', 'thorn', 'CR', 'Zcaron', 'zcaron', 'DLE', 'DC1',

Lib/fontTools/encodings/StandardEncoding.py

@@ -1,5 +1,3 @@
-from fontTools.misc.py23 import *
-
 StandardEncoding = [
 		'.notdef', '.notdef', '.notdef', '.notdef', '.notdef',
 		'.notdef', '.notdef', '.notdef', '.notdef', '.notdef',

Lib/fontTools/encodings/__init__.py

@@ -1,3 +1 @@
 """Empty __init__.py file to signal Python this directory is a package."""
-
-from fontTools.misc.py23 import *

Lib/fontTools/encodings/codecs.py

@@ -1,7 +1,6 @@
 """Extend the Python codecs module with a few encodings that are used in OpenType (name table)
 but missing from Python.  See https://github.com/fonttools/fonttools/issues/236 for details."""
 
-from fontTools.misc.py23 import *
 import codecs
 import encodings
 
@@ -57,35 +56,35 @@ class ExtendCodec(codecs.Codec):
 
 _extended_encodings = {
 	"x_mac_japanese_ttx": ("shift_jis", {
-					b"\xFC": unichr(0x007C),
-					b"\x7E": unichr(0x007E),
-					b"\x80": unichr(0x005C),
-					b"\xA0": unichr(0x00A0),
-					b"\xFD": unichr(0x00A9),
-					b"\xFE": unichr(0x2122),
-					b"\xFF": unichr(0x2026),
+					b"\xFC": chr(0x007C),
+					b"\x7E": chr(0x007E),
+					b"\x80": chr(0x005C),
+					b"\xA0": chr(0x00A0),
+					b"\xFD": chr(0x00A9),
+					b"\xFE": chr(0x2122),
+					b"\xFF": chr(0x2026),
 				}),
 	"x_mac_trad_chinese_ttx": ("big5", {
-					b"\x80": unichr(0x005C),
-					b"\xA0": unichr(0x00A0),
-					b"\xFD": unichr(0x00A9),
-					b"\xFE": unichr(0x2122),
-					b"\xFF": unichr(0x2026),
+					b"\x80": chr(0x005C),
+					b"\xA0": chr(0x00A0),
+					b"\xFD": chr(0x00A9),
+					b"\xFE": chr(0x2122),
+					b"\xFF": chr(0x2026),
 				}),
 	"x_mac_korean_ttx": ("euc_kr", {
-					b"\x80": unichr(0x00A0),
-					b"\x81": unichr(0x20A9),
-					b"\x82": unichr(0x2014),
-					b"\x83": unichr(0x00A9),
-					b"\xFE": unichr(0x2122),
-					b"\xFF": unichr(0x2026),
+					b"\x80": chr(0x00A0),
+					b"\x81": chr(0x20A9),
+					b"\x82": chr(0x2014),
+					b"\x83": chr(0x00A9),
+					b"\xFE": chr(0x2122),
+					b"\xFF": chr(0x2026),
 				}),
 	"x_mac_simp_chinese_ttx": ("gb2312", {
-					b"\x80": unichr(0x00FC),
-					b"\xA0": unichr(0x00A0),
-					b"\xFD": unichr(0x00A9),
-					b"\xFE": unichr(0x2122),
-					b"\xFF": unichr(0x2026),
+					b"\x80": chr(0x00FC),
+					b"\xA0": chr(0x00A0),
+					b"\xFD": chr(0x00A9),
+					b"\xFE": chr(0x2122),
+					b"\xFF": chr(0x2026),
 				}),
 }
 

Lib/fontTools/feaLib/__main__.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from fontTools.ttLib import TTFont
 from fontTools.feaLib.builder import addOpenTypeFeatures, Builder
 from fontTools.feaLib.error import FeatureLibError

Lib/fontTools/feaLib/ast.py

@@ -1,10 +1,9 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import byteord, tobytes
 from fontTools.feaLib.error import FeatureLibError
 from fontTools.feaLib.location import FeatureLibLocation
 from fontTools.misc.encodingTools import getEncoding
 from collections import OrderedDict
 import itertools
-from typing import NamedTuple
 
 SHIFT = " " * 4
 
@@ -1669,7 +1668,7 @@ class NameRecord(Statement):
         def escape(c, escape_pattern):
             # Also escape U+0022 QUOTATION MARK and U+005C REVERSE SOLIDUS
             if c >= 0x20 and c <= 0x7E and c not in (0x22, 0x5C):
-                return unichr(c)
+                return chr(c)
             else:
                 return escape_pattern % c
 

Lib/fontTools/feaLib/builder.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import Tag, tostr
 from fontTools.misc import sstruct
 from fontTools.misc.textTools import binary2num, safeEval
 from fontTools.feaLib.error import FeatureLibError
@@ -33,6 +33,7 @@ from fontTools.otlLib.builder import (
 from fontTools.otlLib.error import OpenTypeLibError
 from collections import defaultdict
 import itertools
+from io import StringIO
 import logging
 import warnings
 import os
@@ -78,7 +79,7 @@ def addOpenTypeFeaturesFromString(
 
     """
 
-    featurefile = UnicodeIO(tounicode(features))
+    featurefile = StringIO(tostr(features))
     if filename:
         featurefile.name = filename
     addOpenTypeFeatures(font, featurefile, tables=tables, debug=debug)

Lib/fontTools/feaLib/lexer.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from fontTools.feaLib.error import FeatureLibError, IncludedFeaNotFound
 from fontTools.feaLib.location import FeatureLibLocation
 import re

Lib/fontTools/feaLib/parser.py

@@ -1,7 +1,7 @@
 from fontTools.feaLib.error import FeatureLibError
 from fontTools.feaLib.lexer import Lexer, IncludingLexer, NonIncludingLexer
 from fontTools.misc.encodingTools import getEncoding
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytechr, tobytes, tostr
 import fontTools.feaLib.ast as ast
 import logging
 import os
@@ -1222,12 +1222,12 @@ class Parser(object):
         # We convert surrogates to actual Unicode by round-tripping through
         # Python's UTF-16 codec in a special mode.
         utf16 = tobytes(s, "utf_16_be", "surrogatepass")
-        return tounicode(utf16, "utf_16_be")
+        return tostr(utf16, "utf_16_be")
 
     @staticmethod
     def unescape_unichr_(match):
         n = match.group(0)[1:]
-        return unichr(int(n, 16))
+        return chr(int(n, 16))
 
     @staticmethod
     def unescape_byte_(match, encoding):

Lib/fontTools/fontBuilder.py

@@ -129,10 +129,8 @@ fb.save("test.otf")
 ```
 """
 
-from .misc.py23 import *
 from .ttLib import TTFont, newTable
 from .ttLib.tables._c_m_a_p import cmap_classes
-from .ttLib.tables._n_a_m_e import NameRecord, makeName
 from .misc.timeTools import timestampNow
 import struct
 from collections import OrderedDict
@@ -894,7 +892,6 @@ def buildCmapSubTable(cmapping, format, platformID, platEncID):
 
 def addFvar(font, axes, instances):
     from .ttLib.tables._f_v_a_r import Axis, NamedInstance
-    from .designspaceLib import AxisDescriptor
 
     assert axes
 

Lib/fontTools/merge.py

@@ -2,7 +2,6 @@
 #
 # Google Author(s): Behdad Esfahbod, Roozbeh Pournader
 
-from fontTools.misc.py23 import *
 from fontTools.misc.timeTools import timestampNow
 from fontTools import ttLib, cffLib
 from fontTools.ttLib.tables import otTables, _h_e_a_d

Lib/fontTools/misc/__init__.py

@@ -1,3 +1 @@
 """Empty __init__.py file to signal Python this directory is a package."""
-
-from fontTools.misc.py23 import *

Lib/fontTools/misc/arrayTools.py

@@ -2,7 +2,6 @@
 so on.
 """
 
-from fontTools.misc.py23 import *
 from fontTools.misc.roundTools import otRound
 from fontTools.misc.vector import Vector as _Vector
 import math

Lib/fontTools/misc/bezierTools.py

@@ -3,8 +3,7 @@
 """
 
 from fontTools.misc.arrayTools import calcBounds, sectRect, rectArea
-from fontTools.misc.transform import Offset, Identity
-from fontTools.misc.py23 import *
+from fontTools.misc.transform import Identity
 import math
 from collections import namedtuple
 

Lib/fontTools/misc/classifyTools.py

@@ -1,7 +1,6 @@
 """ fontTools.misc.classifyTools.py -- tools for classifying things.
 """
 
-from fontTools.misc.py23 import *
 
 class Classifier(object):
 

Lib/fontTools/misc/cliTools.py

@@ -1,5 +1,4 @@
 """Collection of utilities for command-line interfaces and console scripts."""
-from fontTools.misc.py23 import *
 import os
 import re
 

Lib/fontTools/misc/dictTools.py

@@ -1,6 +1,5 @@
 """Misc dict tools."""
 
-from fontTools.misc.py23 import *
 
 __all__ = ['hashdict']
 

Lib/fontTools/misc/eexec.py

@@ -12,7 +12,8 @@ the new key at the end of the operation.
 
 """
 
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytechr, bytesjoin, byteord
+
 
 def _decryptChar(cipher, R):
 	cipher = byteord(cipher)

Lib/fontTools/misc/encodingTools.py

@@ -1,7 +1,6 @@
 """fontTools.misc.encodingTools.py -- tools for working with OpenType encodings.
 """
 
-from fontTools.misc.py23 import *
 import fontTools.encodings.codecs
 
 # Map keyed by platformID, then platEncID, then possibly langID

Lib/fontTools/misc/etree.py

@@ -11,7 +11,7 @@ or subclasses built-in ElementTree classes to add features that are
 only availble in lxml, like OrderedDict for attributes, pretty_print and
 iterwalk.
 """
-from fontTools.misc.py23 import unicode, tounicode, open
+from fontTools.misc.py23 import unicode, tostr
 
 
 XML_DECLARATION = """<?xml version='1.0' encoding='%s'?>"""
@@ -242,7 +242,7 @@ except ImportError:
         Reject all bytes input that contains non-ASCII characters.
         """
         try:
-            s = tounicode(s, encoding="ascii", errors="strict")
+            s = tostr(s, encoding="ascii", errors="strict")
         except UnicodeDecodeError:
             raise ValueError(
                 "Bytes strings can only contain ASCII characters. "

Lib/fontTools/misc/filenames.py

@@ -16,7 +16,7 @@ by Tal Leming and is copyright (c) 2005-2016, The RoboFab Developers:
 -	Tal Leming
 -	Just van Rossum
 """
-from fontTools.misc.py23 import unicode
+
 
 illegalCharacters = r"\" * + / : < > ? [ \ ] | \0".split(" ")
 illegalCharacters += [chr(i) for i in range(1, 32)]
@@ -95,9 +95,9 @@ def userNameToFileName(userName, existing=[], prefix="", suffix=""):
 		>>> userNameToFileName("alt.con") == "alt._con"
 		True
 	"""
-	# the incoming name must be a unicode string
-	if not isinstance(userName, unicode):
-		raise ValueError("The value for userName must be a unicode string.")
+	# the incoming name must be a str
+	if not isinstance(userName, str):
+		raise ValueError("The value for userName must be a string.")
 	# establish the prefix and suffix lengths
 	prefixLength = len(prefix)
 	suffixLength = len(suffix)

Lib/fontTools/misc/fixedTools.py

@@ -17,9 +17,7 @@ functions for converting between fixed-point, float and string representations.
 	The maximum value that can still fit in an F2Dot14. (1.99993896484375)
 """
 
-from fontTools.misc.py23 import *
 from .roundTools import otRound
-import math
 import logging
 
 log = logging.getLogger(__name__)

Lib/fontTools/misc/intTools.py

@@ -1,5 +1,3 @@
-from fontTools.misc.py23 import *
-
 __all__ = ['popCount']
 
 

Lib/fontTools/misc/loggingTools.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 import sys
 import logging
 import timeit

Lib/fontTools/misc/macCreatorType.py

@@ -1,5 +1,4 @@
-from fontTools.misc.py23 import *
-import sys
+from fontTools.misc.py23 import Tag, bytesjoin, strjoin
 try:
 	import xattr
 except ImportError:

Lib/fontTools/misc/macRes.py

@@ -1,4 +1,5 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytesjoin, tostr
+from io import BytesIO
 import struct
 from fontTools.misc import sstruct
 from collections import OrderedDict

Lib/fontTools/misc/plistlib/__init__.py

@@ -1,5 +1,4 @@
 import collections.abc
-import sys
 import re
 from typing import (
     Any,
@@ -24,10 +23,8 @@ from functools import singledispatch
 
 from fontTools.misc import etree
 
-from fontTools.misc.py23 import (
-    tounicode,
-    tobytes,
-)
+from fontTools.misc.py23 import tostr
+
 
 # By default, we
 #  - deserialize <data> elements as bytes and
@@ -368,7 +365,7 @@ def _dict_element(d: Mapping[str, PlistEncodable], ctx: SimpleNamespace) -> etre
                 continue
             raise TypeError("keys must be strings")
         k = etree.SubElement(el, "key")
-        k.text = tounicode(key, "utf-8")
+        k.text = tostr(key, "utf-8")
         el.append(_make_element(value, ctx))
     ctx.indent_level -= 1
     return el

Lib/fontTools/misc/psCharStrings.py

@@ -2,7 +2,7 @@
 CFF dictionary data and Type1/Type2 CharStrings.
 """
 
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytechr, byteord, bytesjoin, strjoin
 from fontTools.misc.fixedTools import (
 	fixedToFloat, floatToFixed, floatToFixedToStr, strToFixedToFloat,
 )

Lib/fontTools/misc/psLib.py

@@ -1,6 +1,21 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytechr, byteord, bytesjoin, tobytes, tostr
 from fontTools.misc import eexec
-from .psOperators import *
+from .psOperators import (
+	PSOperators,
+	ps_StandardEncoding,
+	ps_array,
+	ps_boolean,
+	ps_dict,
+	ps_integer,
+	ps_literal,
+	ps_mark,
+	ps_name,
+	ps_operator,
+	ps_procedure,
+	ps_procmark,
+	ps_real,
+	ps_string,
+)
 import re
 from collections.abc import Callable
 from string import whitespace

Lib/fontTools/misc/psOperators.py

@@ -1,5 +1,3 @@
-from fontTools.misc.py23 import *
-
 _accessstrings = {0: "", 1: "readonly", 2: "executeonly", 3: "noaccess"}
 
 

Lib/fontTools/misc/sstruct.py

@@ -46,7 +46,7 @@ calcsize(fmt)
 	it returns the size of the data in bytes.
 """
 
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import tobytes, tostr
 from fontTools.misc.fixedTools import fixedToFloat as fi2fl, floatToFixed as fl2fi
 import struct
 import re

Lib/fontTools/misc/symfont.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from fontTools.pens.basePen import BasePen
 from functools import partial
 from itertools import count
@@ -112,8 +111,7 @@ MomentXYPen = partial(GreenPen, func=x*y)
 def printGreenPen(penName, funcs, file=sys.stdout):
 
 	print(
-'''from fontTools.misc.py23 import *
-from fontTools.pens.basePen import BasePen
+'''from fontTools.pens.basePen import BasePen
 
 class %s(BasePen):
 

Lib/fontTools/misc/testTools.py

@@ -1,12 +1,13 @@
 """Helpers for writing unit tests."""
 
 from collections.abc import Iterable
+from io import BytesIO
 import os
 import shutil
 import sys
 import tempfile
 from unittest import TestCase as _TestCase
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import tobytes
 from fontTools.misc.xmlWriter import XMLWriter
 
 
@@ -25,7 +26,7 @@ def parseXML(xmlSnippet):
     xml = b"<root>"
     if isinstance(xmlSnippet, bytes):
         xml += xmlSnippet
-    elif isinstance(xmlSnippet, unicode):
+    elif isinstance(xmlSnippet, str):
         xml += tobytes(xmlSnippet, 'utf-8')
     elif isinstance(xmlSnippet, Iterable):
         xml += b"".join(tobytes(s, 'utf-8') for s in xmlSnippet)

Lib/fontTools/misc/textTools.py

@@ -1,7 +1,7 @@
 """fontTools.misc.textTools.py -- miscellaneous routines."""
 
 
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytechr, byteord, bytesjoin, strjoin, tobytes
 import ast
 import string
 

Lib/fontTools/misc/timeTools.py

@@ -1,7 +1,6 @@
 """fontTools.misc.timeTools.py -- tools for working with OpenType timestamps.
 """
 
-from fontTools.misc.py23 import *
 import os
 import time
 from datetime import datetime, timezone

Lib/fontTools/misc/xmlReader.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from fontTools import ttLib
 from fontTools.misc.textTools import safeEval
 from fontTools.ttLib.tables.DefaultTable import DefaultTable

Lib/fontTools/misc/xmlWriter.py

@@ -1,6 +1,6 @@
 """xmlWriter.py -- Simple XML authoring class"""
 
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import byteord, strjoin, tobytes, tostr
 import sys
 import os
 import string
@@ -34,8 +34,8 @@ class XMLWriter(object):
 			self.totype = tobytes
 		except TypeError:
 			# This better not fail.
-			self.file.write(tounicode(''))
-			self.totype = tounicode
+			self.file.write('')
+			self.totype = tostr
 		self.indentwhite = self.totype(indentwhite)
 		if newlinestr is None:
 			self.newlinestr = self.totype(os.linesep)
@@ -156,7 +156,7 @@ class XMLWriter(object):
 			return ""
 		data = ""
 		for attr, value in attributes:
-			if not isinstance(value, (bytes, unicode)):
+			if not isinstance(value, (bytes, str)):
 				value = str(value)
 			data = data + ' %s="%s"' % (attr, escapeattr(value))
 		return data

Lib/fontTools/mtiLib/__init__.py

@@ -6,7 +6,6 @@
 # http://monotype.github.io/OpenType_Table_Source/otl_source.html
 # https://github.com/Monotype/OpenType_Table_Source/
 
-from fontTools.misc.py23 import *
 from fontTools import ttLib
 from fontTools.ttLib.tables._c_m_a_p import cmap_classes
 from fontTools.ttLib.tables import otTables as ot

Lib/fontTools/mtiLib/__main__.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 import sys
 from fontTools.mtiLib import main
 

Lib/fontTools/pens/basePen.py

@@ -36,7 +36,7 @@ Coordinates are usually expressed as (x, y) tuples, but generally any
 sequence of length 2 will do.
 """
 
-from typing import Any, Tuple
+from typing import Tuple
 
 from fontTools.misc.loggingTools import LogMixin
 

Lib/fontTools/pens/pointPen.py

@@ -13,7 +13,7 @@ For instance, whether or not a point is smooth, and its name.
 """
 
 import math
-from typing import Any, List, Optional, Tuple
+from typing import Any, Optional, Tuple
 
 from fontTools.pens.basePen import AbstractPen
 

Lib/fontTools/pens/recordingPen.py

@@ -140,7 +140,6 @@ class RecordingPointPen(AbstractPointPen):
 
 
 if __name__ == "__main__":
-	from fontTools.pens.basePen import _TestPen
 	pen = RecordingPen()
 	pen.moveTo((0, 0))
 	pen.lineTo((0, 100))

Lib/fontTools/subset/__main__.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 import sys
 from fontTools.subset import main
 

Lib/fontTools/svgLib/__init__.py

@@ -1,5 +1,3 @@
-from fontTools.misc.py23 import *
-
 from .path import SVGPath, parse_path
 
 __all__ = ["SVGPath", "parse_path"]

Lib/fontTools/svgLib/path/__init__.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import tostr
 
 from fontTools.pens.transformPen import TransformPen
 from fontTools.misc import etree

Lib/fontTools/svgLib/path/arc.py

@@ -4,10 +4,8 @@ The code is mostly adapted from Blink's SVGPathNormalizer::DecomposeArcToCubic
 https://github.com/chromium/chromium/blob/93831f2/third_party/
 blink/renderer/core/svg/svg_path_parser.cc#L169-L278
 """
-from fontTools.misc.py23 import *
-from fontTools.misc.py23 import isfinite
 from fontTools.misc.transform import Identity, Scale
-from math import atan2, ceil, cos, fabs, pi, radians, sin, sqrt, tan
+from math import atan2, ceil, cos, fabs, isfinite, pi, radians, sin, sqrt, tan
 
 
 TWO_PI = 2 * pi

Lib/fontTools/svgLib/path/parser.py

@@ -7,7 +7,6 @@
 # Copyright (c) 2013-2014 Lennart Regebro
 # License: MIT
 
-from fontTools.misc.py23 import *
 from .arc import EllipticalArc
 import re
 

Lib/fontTools/t1Lib/__init__.py

@@ -15,7 +15,7 @@ write(path, data, kind='OTHER', dohex=False)
 	part should be written as hexadecimal or binary, but only if kind
 	is 'OTHER'.
 """
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytechr, byteord, bytesjoin
 from fontTools.misc import eexec
 from fontTools.misc.macCreatorType import getMacCreatorAndType
 import os

Lib/fontTools/ttLib/__init__.py

@@ -41,7 +41,6 @@ Dumping 'prep' table...
 
 """
 
-from fontTools.misc.py23 import *
 from fontTools.misc.loggingTools import deprecateFunction
 import logging
 

Lib/fontTools/ttLib/macUtils.py

@@ -1,5 +1,5 @@
 """ttLib.macUtils.py -- Various Mac-specific stuff."""
-from fontTools.misc.py23 import *
+from io import BytesIO
 from fontTools.misc.macRes import ResourceReader, ResourceError
 
 

Lib/fontTools/ttLib/standardGlyphOrder.py

@@ -1,5 +1,3 @@
-from fontTools.misc.py23 import *
-
 #
 # 'post' table formats 1.0 and 2.0 rely on this list of "standard"
 # glyphs.

Lib/fontTools/ttLib/tables/B_A_S_E_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .otBase import BaseTTXConverter
 
 

Lib/fontTools/ttLib/tables/BitmapGlyphMetrics.py

@@ -1,6 +1,5 @@
 # Since bitmap glyph metrics are shared between EBLC and EBDT
 # this class gets its own python file.
-from fontTools.misc.py23 import *
 from fontTools.misc import sstruct
 from fontTools.misc.textTools import safeEval
 import logging

Lib/fontTools/ttLib/tables/C_B_D_T_.py

@@ -3,7 +3,7 @@
 # Google Author(s): Matt Fontaine
 
 
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytesjoin
 from fontTools.misc import sstruct
 from . import E_B_D_T_
 from .BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat

Lib/fontTools/ttLib/tables/C_B_L_C_.py

@@ -2,7 +2,6 @@
 #
 # Google Author(s): Matt Fontaine
 
-from fontTools.misc.py23 import *
 from . import E_B_L_C_
 
 class table_C_B_L_C_(E_B_L_C_.table_E_B_L_C_):

Lib/fontTools/ttLib/tables/C_F_F_.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from io import BytesIO
 from fontTools import cffLib
 from . import DefaultTable
 

Lib/fontTools/ttLib/tables/C_F_F__2.py

@@ -1,5 +1,4 @@
-from fontTools.misc.py23 import *
-from fontTools import cffLib
+from io import BytesIO
 from fontTools.ttLib.tables.C_F_F_ import table_C_F_F_
 
 

Lib/fontTools/ttLib/tables/C_O_L_R_.py

@@ -2,7 +2,6 @@
 #
 # Google Author(s): Behdad Esfahbod
 
-from fontTools.misc.py23 import *
 from fontTools.misc.textTools import safeEval
 from . import DefaultTable
 

Lib/fontTools/ttLib/tables/C_P_A_L_.py

@@ -2,7 +2,7 @@
 #
 # Google Author(s): Behdad Esfahbod
 
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytesjoin
 from fontTools.misc.textTools import safeEval
 from . import DefaultTable
 import array

Lib/fontTools/ttLib/tables/D_S_I_G_.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytesjoin, strjoin, tobytes, tostr
 from fontTools.misc.textTools import safeEval
 from fontTools.misc import sstruct
 from . import DefaultTable

Lib/fontTools/ttLib/tables/DefaultTable.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import Tag
 from fontTools.ttLib import getClassTag
 
 class DefaultTable(object):

Lib/fontTools/ttLib/tables/E_B_D_T_.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytechr, byteord, bytesjoin, strjoin
 from fontTools.misc import sstruct
 from fontTools.misc.textTools import safeEval, readHex, hexStr, deHexStr
 from .BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat

Lib/fontTools/ttLib/tables/E_B_L_C_.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytesjoin
 from fontTools.misc import sstruct
 from . import DefaultTable
 from fontTools.misc.textTools import safeEval

Lib/fontTools/ttLib/tables/F_F_T_M_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from fontTools.misc import sstruct
 from fontTools.misc.textTools import safeEval
 from fontTools.misc.timeTools import timestampFromString, timestampToString

Lib/fontTools/ttLib/tables/F__e_a_t.py

@@ -1,8 +1,6 @@
-from fontTools.misc.py23 import *
 from fontTools.misc import sstruct
 from fontTools.misc.fixedTools import floatToFixedToStr
 from fontTools.misc.textTools import safeEval
-from .otBase import BaseTTXConverter
 from . import DefaultTable
 from . import grUtils
 import struct

Lib/fontTools/ttLib/tables/G_D_E_F_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .otBase import BaseTTXConverter
 
 

Lib/fontTools/ttLib/tables/G_M_A_P_.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import tobytes, tostr
 from fontTools.misc import sstruct
 from fontTools.misc.textTools import safeEval
 from . import DefaultTable

Lib/fontTools/ttLib/tables/G_P_K_G_.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytesjoin
 from fontTools.misc import sstruct
 from fontTools.misc.textTools import safeEval, readHex
 from . import DefaultTable

Lib/fontTools/ttLib/tables/G_P_O_S_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .otBase import BaseTTXConverter
 
 

Lib/fontTools/ttLib/tables/G_S_U_B_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .otBase import BaseTTXConverter
 
 

Lib/fontTools/ttLib/tables/G__l_a_t.py

@@ -1,12 +1,11 @@
-from fontTools.misc.py23 import *
 from fontTools.misc import sstruct
 from fontTools.misc.fixedTools import floatToFixedToStr
 from fontTools.misc.textTools import safeEval
-from itertools import *
+# from itertools import *
 from functools import partial
 from . import DefaultTable
 from . import grUtils
-import struct, operator, warnings
+import struct
 
 
 Glat_format_0 = """

Lib/fontTools/ttLib/tables/G__l_o_c.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from fontTools.misc import sstruct
 from fontTools.misc.textTools import safeEval
 from . import DefaultTable

Lib/fontTools/ttLib/tables/H_V_A_R_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .otBase import BaseTTXConverter
 
 

Lib/fontTools/ttLib/tables/J_S_T_F_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .otBase import BaseTTXConverter
 
 

Lib/fontTools/ttLib/tables/L_T_S_H_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from fontTools.misc.textTools import safeEval
 from . import DefaultTable
 import struct

Lib/fontTools/ttLib/tables/M_A_T_H_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .otBase import BaseTTXConverter
 
 

Lib/fontTools/ttLib/tables/M_E_T_A_.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import byteord
 from fontTools.misc import sstruct
 from fontTools.misc.textTools import safeEval
 from . import DefaultTable
@@ -229,7 +229,7 @@ class GlyphRecord(object):
 # XXX The following two functions are really broken around UTF-8 vs Unicode
 
 def mapXMLToUTF8(string):
-	uString = unicode()
+	uString = str()
 	strLen = len(string)
 	i = 0
 	while i < strLen:
@@ -245,9 +245,9 @@ def mapXMLToUTF8(string):
 				i = i+1
 			valStr = string[j:i]
 
-			uString = uString + unichr(eval('0x' + valStr))
+			uString = uString + chr(eval('0x' + valStr))
 		else:
-			uString = uString + unichr(byteord(string[i]))
+			uString = uString + chr(byteord(string[i]))
 		i = i +1
 
 	return uString.encode('utf_8')

Lib/fontTools/ttLib/tables/M_V_A_R_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .otBase import BaseTTXConverter
 
 

Lib/fontTools/ttLib/tables/O_S_2f_2.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from fontTools.misc import sstruct
 from fontTools.misc.textTools import safeEval, num2binary, binary2num
 from fontTools.ttLib.tables import DefaultTable

Lib/fontTools/ttLib/tables/S_I_N_G_.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytechr, byteord, tobytes, tostr
 from fontTools.misc import sstruct
 from fontTools.misc.textTools import safeEval
 from . import DefaultTable

Lib/fontTools/ttLib/tables/S_T_A_T_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .otBase import BaseTTXConverter
 
 

Lib/fontTools/ttLib/tables/S_V_G_.py

@@ -1,12 +1,12 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import bytesjoin, strjoin, tobytes, tostr
 from fontTools.misc import sstruct
 from . import DefaultTable
 try:
 	import xml.etree.cElementTree as ET
 except ImportError:
 	import xml.etree.ElementTree as ET
+from io import BytesIO
 import struct
-import re
 import logging
 
 

Lib/fontTools/ttLib/tables/S__i_l_f.py

@@ -1,13 +1,13 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import byteord
 from fontTools.misc import sstruct
 from fontTools.misc.fixedTools import floatToFixedToStr
 from fontTools.misc.textTools import safeEval
-from itertools import *
+# from itertools import *
 from . import DefaultTable
 from . import grUtils
 from array import array
 from functools import reduce
-import struct, operator, warnings, re, sys
+import struct, re, sys
 
 Silf_hdr_format = '''
     >

Lib/fontTools/ttLib/tables/S__i_l_l.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from fontTools.misc import sstruct
 from fontTools.misc.fixedTools import floatToFixedToStr
 from fontTools.misc.textTools import safeEval

Lib/fontTools/ttLib/tables/T_S_I_B_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .T_S_I_V_ import table_T_S_I_V_
 
 class table_T_S_I_B_(table_T_S_I_V_):

Lib/fontTools/ttLib/tables/T_S_I_C_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .otBase import BaseTTXConverter
 
 

Lib/fontTools/ttLib/tables/T_S_I_D_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .T_S_I_V_ import table_T_S_I_V_
 
 class table_T_S_I_D_(table_T_S_I_V_):

Lib/fontTools/ttLib/tables/T_S_I_J_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .T_S_I_V_ import table_T_S_I_V_
 
 class table_T_S_I_J_(table_T_S_I_V_):

Lib/fontTools/ttLib/tables/T_S_I_P_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .T_S_I_V_ import table_T_S_I_V_
 
 class table_T_S_I_P_(table_T_S_I_V_):

Lib/fontTools/ttLib/tables/T_S_I_S_.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from .T_S_I_V_ import table_T_S_I_V_
 
 class table_T_S_I_S_(table_T_S_I_V_):

Lib/fontTools/ttLib/tables/T_S_I_V_.py

@@ -1,4 +1,4 @@
-from fontTools.misc.py23 import *
+from fontTools.misc.py23 import strjoin, tobytes, tostr
 from . import asciiTable
 
 class table_T_S_I_V_(asciiTable.asciiTable):

Lib/fontTools/ttLib/tables/T_S_I__0.py

@@ -5,7 +5,6 @@ TSI0 is the index table containing the lengths and offsets for the glyph
 programs and 'extra' programs ('fpgm', 'prep', and 'cvt') that are contained
 in the TSI1 table.
 """
-from fontTools.misc.py23 import *
 from . import DefaultTable
 import struct