Merge pull request #1690 from fonttools/py3-varLib-remove-py23-imports

varLib: Remove py23 imports

Lib/fontTools/varLib/__main__.py

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

Lib/fontTools/varLib/cff.py

@@ -12,7 +12,7 @@ from fontTools.cffLib import (
 	FontDict,
 	VarStoreData
 )
-from fontTools.misc.py23 import BytesIO
+from io import BytesIO
 from fontTools.cffLib.specializer import (
 	specializeCommands, commandsToProgram)
 from fontTools.ttLib import newTable

Lib/fontTools/varLib/featureVars.py

@@ -3,7 +3,6 @@ https://docs.microsoft.com/en-us/typography/opentype/spec/chapter2#featurevariat
 
 NOTE: The API is experimental and subject to change.
 """
-from fontTools.misc.py23 import *
 from fontTools.misc.dictTools import hashdict
 from fontTools.misc.intTools import popCount
 from fontTools.ttLib import newTable

Lib/fontTools/varLib/instancer.py

@@ -65,7 +65,6 @@ are supported, but support for CFF2 variable fonts will be added soon.
 The discussion and implementation of these features are tracked at
 https://github.com/fonttools/fonttools/issues/1537
 """
-from fontTools.misc.py23 import *
 from fontTools.misc.fixedTools import floatToFixedToFloat, otRound
 from fontTools.varLib.models import supportScalar, normalizeValue, piecewiseLinearMap
 from fontTools.ttLib import TTFont

Lib/fontTools/varLib/interpolatable.py

@@ -6,8 +6,6 @@ Call as:
 $ fonttools varLib.interpolatable font1 font2 ...
 """
 
-from fontTools.misc.py23 import *
-
 from fontTools.pens.basePen import AbstractPen, BasePen
 from fontTools.pens.recordingPen import RecordingPen
 from fontTools.pens.statisticsPen import StatisticsPen

Lib/fontTools/varLib/interpolate_layout.py

@@ -1,7 +1,6 @@
 """
 Interpolate OpenType Layout tables (GDEF / GPOS / GSUB).
 """
-from fontTools.misc.py23 import *
 from fontTools.ttLib import TTFont
 from fontTools.varLib import models, VarLibError, load_designspace, load_masters
 from fontTools.varLib.merger import InstancerMerger

Lib/fontTools/varLib/iup.py

@@ -1,6 +1,3 @@
-from fontTools.misc.py23 import *
-
-
 def iup_segment(coords, rc1, rd1, rc2, rd2):
 	# rc1 = reference coord 1
 	# rd1 = reference delta 1

Lib/fontTools/varLib/merger.py

@@ -3,7 +3,6 @@ Merge OpenType Layout tables (GDEF / GPOS / GSUB).
 """
 import copy
 from operator import ior
-from fontTools.misc.py23 import *
 from fontTools.misc.fixedTools import otRound
 from fontTools.misc import classifyTools
 from fontTools.ttLib.tables import otTables as ot

Lib/fontTools/varLib/models.py

@@ -1,5 +1,4 @@
 """Variation fonts interpolation models."""
-from fontTools.misc.py23 import *
 
 __all__ = ['nonNone', 'allNone', 'allEqual', 'allEqualTo', 'subList',
 	   'normalizeValue', 'normalizeLocation',
@@ -138,7 +137,7 @@ def supportScalar(location, support, ot=True):
 			continue
 		if v <= lower or upper <= v:
 			scalar = 0.
-			break;
+			break
 		if v < peak:
 			scalar *= (v - lower) / (peak - lower)
 		else: # v > peak
@@ -370,7 +369,7 @@ class VariationModel(object):
 	def interpolateFromDeltasAndScalars(deltas, scalars):
 		v = None
 		assert len(deltas) == len(scalars)
-		for i,(delta,scalar) in enumerate(zip(deltas, scalars)):
+		for delta, scalar in zip(deltas, scalars):
 			if not scalar: continue
 			contribution = delta * scalar
 			if v is None:

Lib/fontTools/varLib/mutator.py

@@ -3,7 +3,6 @@ Instantiate a variation font.  Run, eg:
 
 $ fonttools varLib.mutator ./NotoSansArabic-VF.ttf wght=140 wdth=85
 """
-from fontTools.misc.py23 import *
 from fontTools.misc.fixedTools import floatToFixedToFloat, otRound, floatToFixed
 from fontTools.pens.boundsPen import BoundsPen
 from fontTools.ttLib import TTFont, newTable
@@ -21,6 +20,7 @@ from fontTools.varLib.iup import iup_delta
 import fontTools.subset.cff
 import os.path
 import logging
+from io import BytesIO
 
 
 log = logging.getLogger("fontTools.varlib.mutator")

Lib/fontTools/varLib/mvar.py

@@ -1,5 +1,3 @@
-from fontTools.misc.py23 import *
-
 MVAR_ENTRIES = {
 	'hasc': ('OS/2', 'sTypoAscender'),		 # horizontal ascender
 	'hdsc': ('OS/2', 'sTypoDescender'),		 # horizontal descender

Lib/fontTools/varLib/plot.py

@@ -1,6 +1,5 @@
 """Visualize DesignSpaceDocument and resulting VariationModel."""
 
-from fontTools.misc.py23 import *
 from fontTools.varLib.models import VariationModel, supportScalar
 from fontTools.designspaceLib import DesignSpaceDocument
 from mpl_toolkits.mplot3d import axes3d

Lib/fontTools/varLib/varStore.py

@@ -1,4 +1,3 @@
-from fontTools.misc.py23 import *
 from fontTools.misc.fixedTools import otRound
 from fontTools.ttLib.tables import otTables as ot
 from fontTools.varLib.models import supportScalar