diff --git a/Lib/fontTools/__init__.py b/Lib/fontTools/__init__.py index d12156c73..235ba5d03 100644 --- a/Lib/fontTools/__init__.py +++ b/Lib/fontTools/__init__.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import logging from fontTools.misc.loggingTools import configLogger diff --git a/Lib/fontTools/__main__.py b/Lib/fontTools/__main__.py index 7d45751b0..ba09c7fc6 100644 --- a/Lib/fontTools/__main__.py +++ b/Lib/fontTools/__main__.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import import sys diff --git a/Lib/fontTools/afmLib.py b/Lib/fontTools/afmLib.py index db01d3461..9b0c9e4fc 100644 --- a/Lib/fontTools/afmLib.py +++ b/Lib/fontTools/afmLib.py @@ -4,7 +4,6 @@ # It does not implement the full spec (Adobe Technote 5004, Adobe Font Metrics # File Format Specification). Still, it should read most "common" AFM files. -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import re diff --git a/Lib/fontTools/agl.py b/Lib/fontTools/agl.py index ec1a1b07e..d15cac349 100644 --- a/Lib/fontTools/agl.py +++ b/Lib/fontTools/agl.py @@ -2,8 +2,6 @@ # The table below is taken from # http://www.adobe.com/devnet/opentype/archives/aglfn.txt -from __future__ import (print_function, division, absolute_import, - unicode_literals) from fontTools.misc.py23 import * import re diff --git a/Lib/fontTools/cffLib/__init__.py b/Lib/fontTools/cffLib/__init__.py index e9065407e..84e616fe4 100644 --- a/Lib/fontTools/cffLib/__init__.py +++ b/Lib/fontTools/cffLib/__init__.py @@ -1,6 +1,5 @@ """cffLib.py -- read/write tools for Adobe CFF fonts.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc import psCharStrings diff --git a/Lib/fontTools/cffLib/specializer.py b/Lib/fontTools/cffLib/specializer.py index 794a2e98c..ff2c9ae8c 100644 --- a/Lib/fontTools/cffLib/specializer.py +++ b/Lib/fontTools/cffLib/specializer.py @@ -2,7 +2,6 @@ """T2CharString operator specializer and generalizer.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.cffLib import maxStackLimit diff --git a/Lib/fontTools/cffLib/width.py b/Lib/fontTools/cffLib/width.py index a9e553236..d959da1c5 100644 --- a/Lib/fontTools/cffLib/width.py +++ b/Lib/fontTools/cffLib/width.py @@ -2,7 +2,6 @@ """T2CharString glyph width optimizer.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont, getTableClass from collections import defaultdict diff --git a/Lib/fontTools/designspaceLib/__init__.py b/Lib/fontTools/designspaceLib/__init__.py index 6bf107c39..0c58de254 100644 --- a/Lib/fontTools/designspaceLib/__init__.py +++ b/Lib/fontTools/designspaceLib/__init__.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.loggingTools import LogMixin import collections diff --git a/Lib/fontTools/encodings/MacRoman.py b/Lib/fontTools/encodings/MacRoman.py index 43c58ebb0..9e8f24413 100644 --- a/Lib/fontTools/encodings/MacRoman.py +++ b/Lib/fontTools/encodings/MacRoman.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * MacRoman = [ diff --git a/Lib/fontTools/encodings/StandardEncoding.py b/Lib/fontTools/encodings/StandardEncoding.py index dc01ef8ff..60b587349 100644 --- a/Lib/fontTools/encodings/StandardEncoding.py +++ b/Lib/fontTools/encodings/StandardEncoding.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * StandardEncoding = [ diff --git a/Lib/fontTools/encodings/__init__.py b/Lib/fontTools/encodings/__init__.py index 3f9abc961..b1760311b 100644 --- a/Lib/fontTools/encodings/__init__.py +++ b/Lib/fontTools/encodings/__init__.py @@ -1,4 +1,3 @@ """Empty __init__.py file to signal Python this directory is a package.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * diff --git a/Lib/fontTools/encodings/codecs.py b/Lib/fontTools/encodings/codecs.py index 5e401f064..ac2b99094 100644 --- a/Lib/fontTools/encodings/codecs.py +++ b/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 __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import codecs import encodings diff --git a/Lib/fontTools/feaLib/__main__.py b/Lib/fontTools/feaLib/__main__.py index da4eff6c7..b3fd87d5b 100644 --- a/Lib/fontTools/feaLib/__main__.py +++ b/Lib/fontTools/feaLib/__main__.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont from fontTools.feaLib.builder import addOpenTypeFeatures, Builder diff --git a/Lib/fontTools/feaLib/ast.py b/Lib/fontTools/feaLib/ast.py index 1994fc08c..b0f805a7e 100644 --- a/Lib/fontTools/feaLib/ast.py +++ b/Lib/fontTools/feaLib/ast.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.feaLib.error import FeatureLibError from fontTools.misc.encodingTools import getEncoding diff --git a/Lib/fontTools/feaLib/builder.py b/Lib/fontTools/feaLib/builder.py index 8880acf1c..342327be7 100644 --- a/Lib/fontTools/feaLib/builder.py +++ b/Lib/fontTools/feaLib/builder.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import binary2num, safeEval diff --git a/Lib/fontTools/feaLib/error.py b/Lib/fontTools/feaLib/error.py index 8281f959a..82a7dec5a 100644 --- a/Lib/fontTools/feaLib/error.py +++ b/Lib/fontTools/feaLib/error.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals class FeatureLibError(Exception): diff --git a/Lib/fontTools/feaLib/lexer.py b/Lib/fontTools/feaLib/lexer.py index 095cb6684..792c190df 100644 --- a/Lib/fontTools/feaLib/lexer.py +++ b/Lib/fontTools/feaLib/lexer.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.feaLib.error import FeatureLibError, IncludedFeaNotFound import re diff --git a/Lib/fontTools/feaLib/parser.py b/Lib/fontTools/feaLib/parser.py index 9edfc46f3..0ea35a678 100644 --- a/Lib/fontTools/feaLib/parser.py +++ b/Lib/fontTools/feaLib/parser.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.feaLib.error import FeatureLibError from fontTools.feaLib.lexer import Lexer, IncludingLexer, NonIncludingLexer from fontTools.misc.encodingTools import getEncoding diff --git a/Lib/fontTools/fontBuilder.py b/Lib/fontTools/fontBuilder.py index c6811f055..bd6b2e50e 100644 --- a/Lib/fontTools/fontBuilder.py +++ b/Lib/fontTools/fontBuilder.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals __all__ = ["FontBuilder"] diff --git a/Lib/fontTools/merge.py b/Lib/fontTools/merge.py index 36ac75659..363c6ec09 100644 --- a/Lib/fontTools/merge.py +++ b/Lib/fontTools/merge.py @@ -5,7 +5,6 @@ """Font merger. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.timeTools import timestampNow from fontTools import ttLib, cffLib diff --git a/Lib/fontTools/misc/__init__.py b/Lib/fontTools/misc/__init__.py index 3f9abc961..b1760311b 100644 --- a/Lib/fontTools/misc/__init__.py +++ b/Lib/fontTools/misc/__init__.py @@ -1,4 +1,3 @@ """Empty __init__.py file to signal Python this directory is a package.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * diff --git a/Lib/fontTools/misc/arrayTools.py b/Lib/fontTools/misc/arrayTools.py index ed20230c9..f929676c6 100644 --- a/Lib/fontTools/misc/arrayTools.py +++ b/Lib/fontTools/misc/arrayTools.py @@ -4,7 +4,6 @@ # -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import otRound from numbers import Number diff --git a/Lib/fontTools/misc/bezierTools.py b/Lib/fontTools/misc/bezierTools.py index 73053052d..bd436fe23 100644 --- a/Lib/fontTools/misc/bezierTools.py +++ b/Lib/fontTools/misc/bezierTools.py @@ -2,7 +2,6 @@ """fontTools.misc.bezierTools.py -- tools for working with bezier path segments. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.arrayTools import calcBounds from fontTools.misc.py23 import * import math diff --git a/Lib/fontTools/misc/classifyTools.py b/Lib/fontTools/misc/classifyTools.py index 64bcdc8a7..73101186b 100644 --- a/Lib/fontTools/misc/classifyTools.py +++ b/Lib/fontTools/misc/classifyTools.py @@ -1,7 +1,6 @@ """ fontTools.misc.classifyTools.py -- tools for classifying things. """ -from __future__ import print_function, absolute_import from fontTools.misc.py23 import * class Classifier(object): diff --git a/Lib/fontTools/misc/cliTools.py b/Lib/fontTools/misc/cliTools.py index 8420e3e7c..48913c14f 100644 --- a/Lib/fontTools/misc/cliTools.py +++ b/Lib/fontTools/misc/cliTools.py @@ -1,5 +1,4 @@ """Collection of utilities for command-line interfaces and console scripts.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import os import re diff --git a/Lib/fontTools/misc/dictTools.py b/Lib/fontTools/misc/dictTools.py index db5d65873..47528684f 100644 --- a/Lib/fontTools/misc/dictTools.py +++ b/Lib/fontTools/misc/dictTools.py @@ -1,6 +1,5 @@ """Misc dict tools.""" -from __future__ import print_function, absolute_import, division from fontTools.misc.py23 import * __all__ = ['hashdict'] diff --git a/Lib/fontTools/misc/eexec.py b/Lib/fontTools/misc/eexec.py index 0efa6f56f..19ec6b08e 100644 --- a/Lib/fontTools/misc/eexec.py +++ b/Lib/fontTools/misc/eexec.py @@ -2,7 +2,6 @@ charstring encryption algorithm as used by PostScript Type 1 fonts. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * def _decryptChar(cipher, R): diff --git a/Lib/fontTools/misc/encodingTools.py b/Lib/fontTools/misc/encodingTools.py index 454ec9ac6..438e484d9 100644 --- a/Lib/fontTools/misc/encodingTools.py +++ b/Lib/fontTools/misc/encodingTools.py @@ -1,7 +1,6 @@ """fontTools.misc.encodingTools.py -- tools for working with OpenType encodings. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import fontTools.encodings.codecs diff --git a/Lib/fontTools/misc/etree.py b/Lib/fontTools/misc/etree.py index 08e43f0a5..2338f0998 100644 --- a/Lib/fontTools/misc/etree.py +++ b/Lib/fontTools/misc/etree.py @@ -11,7 +11,6 @@ or subclasses built-in ElementTree classes to add features that are only availble in lxml, like OrderedDict for attributes, pretty_print and iterwalk. """ -from __future__ import absolute_import, unicode_literals from fontTools.misc.py23 import basestring, unicode, tounicode, open diff --git a/Lib/fontTools/misc/filenames.py b/Lib/fontTools/misc/filenames.py index 260ace4c5..6c65818c4 100644 --- a/Lib/fontTools/misc/filenames.py +++ b/Lib/fontTools/misc/filenames.py @@ -11,7 +11,6 @@ Copyright (c) 2005-2016, The RoboFab Developers: Tal Leming Just van Rossum """ -from __future__ import unicode_literals from fontTools.misc.py23 import basestring, unicode diff --git a/Lib/fontTools/misc/fixedTools.py b/Lib/fontTools/misc/fixedTools.py index c5119abd6..1c3fe337d 100644 --- a/Lib/fontTools/misc/fixedTools.py +++ b/Lib/fontTools/misc/fixedTools.py @@ -1,7 +1,6 @@ """fontTools.misc.fixedTools.py -- tools for working with fixed numbers. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import math import logging diff --git a/Lib/fontTools/misc/intTools.py b/Lib/fontTools/misc/intTools.py index 9eb2f0f9c..cdae292a7 100644 --- a/Lib/fontTools/misc/intTools.py +++ b/Lib/fontTools/misc/intTools.py @@ -1,6 +1,5 @@ """Misc integer tools.""" -from __future__ import print_function, absolute_import, division from fontTools.misc.py23 import * __all__ = ['popCount'] diff --git a/Lib/fontTools/misc/loggingTools.py b/Lib/fontTools/misc/loggingTools.py index b4b9a9b05..f479c916a 100644 --- a/Lib/fontTools/misc/loggingTools.py +++ b/Lib/fontTools/misc/loggingTools.py @@ -2,7 +2,6 @@ logging package. """ -from __future__ import print_function, absolute_import from fontTools.misc.py23 import * import sys import logging diff --git a/Lib/fontTools/misc/macCreatorType.py b/Lib/fontTools/misc/macCreatorType.py index 2b33e898f..a5218d21a 100644 --- a/Lib/fontTools/misc/macCreatorType.py +++ b/Lib/fontTools/misc/macCreatorType.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import sys try: diff --git a/Lib/fontTools/misc/macRes.py b/Lib/fontTools/misc/macRes.py index db832ec54..e8b3cbc20 100644 --- a/Lib/fontTools/misc/macRes.py +++ b/Lib/fontTools/misc/macRes.py @@ -1,5 +1,4 @@ """ Tools for reading Mac resource forks. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import struct from fontTools.misc import sstruct diff --git a/Lib/fontTools/misc/plistlib.py b/Lib/fontTools/misc/plistlib.py index a0e1003f7..52f7ec391 100644 --- a/Lib/fontTools/misc/plistlib.py +++ b/Lib/fontTools/misc/plistlib.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, unicode_literals import sys import re from io import BytesIO diff --git a/Lib/fontTools/misc/psCharStrings.py b/Lib/fontTools/misc/psCharStrings.py index a97ec96dd..4ca11fb40 100644 --- a/Lib/fontTools/misc/psCharStrings.py +++ b/Lib/fontTools/misc/psCharStrings.py @@ -2,7 +2,6 @@ CFF dictionary data and Type1/Type2 CharStrings. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import fixedToFloat, otRound from fontTools.pens.boundsPen import BoundsPen diff --git a/Lib/fontTools/misc/psLib.py b/Lib/fontTools/misc/psLib.py index e069e7b63..5dc94ae38 100644 --- a/Lib/fontTools/misc/psLib.py +++ b/Lib/fontTools/misc/psLib.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import eexec from .psOperators import * diff --git a/Lib/fontTools/misc/psOperators.py b/Lib/fontTools/misc/psOperators.py index 4aa0281b7..de278fd63 100644 --- a/Lib/fontTools/misc/psOperators.py +++ b/Lib/fontTools/misc/psOperators.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * _accessstrings = {0: "", 1: "readonly", 2: "executeonly", 3: "noaccess"} diff --git a/Lib/fontTools/misc/sstruct.py b/Lib/fontTools/misc/sstruct.py index 6b7e783ed..8b69a4296 100644 --- a/Lib/fontTools/misc/sstruct.py +++ b/Lib/fontTools/misc/sstruct.py @@ -46,7 +46,6 @@ calcsize(fmt) it returns the size of the data in bytes. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import fixedToFloat as fi2fl, floatToFixed as fl2fi import struct diff --git a/Lib/fontTools/misc/symfont.py b/Lib/fontTools/misc/symfont.py index d09efac43..d3e5ce23a 100644 --- a/Lib/fontTools/misc/symfont.py +++ b/Lib/fontTools/misc/symfont.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import BasePen from functools import partial @@ -113,8 +112,7 @@ MomentXYPen = partial(GreenPen, func=x*y) def printGreenPen(penName, funcs, file=sys.stdout): print( -'''from __future__ import print_function, division, absolute_import -from fontTools.misc.py23 import * +'''from fontTools.misc.py23 import * from fontTools.pens.basePen import BasePen class %s(BasePen): diff --git a/Lib/fontTools/misc/testTools.py b/Lib/fontTools/misc/testTools.py index 3759d4ed8..b4ade8b5a 100644 --- a/Lib/fontTools/misc/testTools.py +++ b/Lib/fontTools/misc/testTools.py @@ -1,7 +1,5 @@ """Helpers for writing unit tests.""" -from __future__ import (print_function, division, absolute_import, - unicode_literals) try: from collections.abc import Iterable except ImportError: # python < 3.3 diff --git a/Lib/fontTools/misc/textTools.py b/Lib/fontTools/misc/textTools.py index 08c59909d..6a047ae69 100644 --- a/Lib/fontTools/misc/textTools.py +++ b/Lib/fontTools/misc/textTools.py @@ -1,7 +1,6 @@ """fontTools.misc.textTools.py -- miscellaneous routines.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import ast import string diff --git a/Lib/fontTools/misc/timeTools.py b/Lib/fontTools/misc/timeTools.py index 657d77f86..e9c6f197c 100644 --- a/Lib/fontTools/misc/timeTools.py +++ b/Lib/fontTools/misc/timeTools.py @@ -1,7 +1,6 @@ """fontTools.misc.timeTools.py -- tools for working with OpenType timestamps. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import os import time diff --git a/Lib/fontTools/misc/transform.py b/Lib/fontTools/misc/transform.py index 1296571ba..e0e5111b7 100644 --- a/Lib/fontTools/misc/transform.py +++ b/Lib/fontTools/misc/transform.py @@ -45,7 +45,6 @@ Examples: >>> """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * __all__ = ["Transform", "Identity", "Offset", "Scale"] diff --git a/Lib/fontTools/misc/xmlReader.py b/Lib/fontTools/misc/xmlReader.py index e9b5cfd87..406bba27c 100644 --- a/Lib/fontTools/misc/xmlReader.py +++ b/Lib/fontTools/misc/xmlReader.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import ttLib from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/misc/xmlWriter.py b/Lib/fontTools/misc/xmlWriter.py index ef51a79ae..6ab8469e4 100644 --- a/Lib/fontTools/misc/xmlWriter.py +++ b/Lib/fontTools/misc/xmlWriter.py @@ -1,6 +1,5 @@ """xmlWriter.py -- Simple XML authoring class""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import sys import os diff --git a/Lib/fontTools/mtiLib/__init__.py b/Lib/fontTools/mtiLib/__init__.py index beec5cb5a..67e99d724 100644 --- a/Lib/fontTools/mtiLib/__init__.py +++ b/Lib/fontTools/mtiLib/__init__.py @@ -6,8 +6,6 @@ # http://monotype.github.io/OpenType_Table_Source/otl_source.html # https://github.com/Monotype/OpenType_Table_Source/ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools import ttLib from fontTools.ttLib.tables._c_m_a_p import cmap_classes diff --git a/Lib/fontTools/mtiLib/__main__.py b/Lib/fontTools/mtiLib/__main__.py index 0741237f0..eacfefd59 100644 --- a/Lib/fontTools/mtiLib/__main__.py +++ b/Lib/fontTools/mtiLib/__main__.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import sys from fontTools.mtiLib import main diff --git a/Lib/fontTools/otlLib/builder.py b/Lib/fontTools/otlLib/builder.py index a087b2d3e..dd0aabe75 100644 --- a/Lib/fontTools/otlLib/builder.py +++ b/Lib/fontTools/otlLib/builder.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from collections import namedtuple from fontTools import ttLib from fontTools.ttLib.tables import otTables as ot diff --git a/Lib/fontTools/otlLib/maxContextCalc.py b/Lib/fontTools/otlLib/maxContextCalc.py index 5659310f2..40c3d6dbd 100644 --- a/Lib/fontTools/otlLib/maxContextCalc.py +++ b/Lib/fontTools/otlLib/maxContextCalc.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals __all__ = ['maxCtxFont'] diff --git a/Lib/fontTools/pens/__init__.py b/Lib/fontTools/pens/__init__.py index 3f9abc961..b1760311b 100644 --- a/Lib/fontTools/pens/__init__.py +++ b/Lib/fontTools/pens/__init__.py @@ -1,4 +1,3 @@ """Empty __init__.py file to signal Python this directory is a package.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * diff --git a/Lib/fontTools/pens/areaPen.py b/Lib/fontTools/pens/areaPen.py index 564caa4c8..c9301542e 100644 --- a/Lib/fontTools/pens/areaPen.py +++ b/Lib/fontTools/pens/areaPen.py @@ -1,6 +1,5 @@ """Calculate the area of a glyph.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import BasePen diff --git a/Lib/fontTools/pens/basePen.py b/Lib/fontTools/pens/basePen.py index e0d3ae06d..1593024f3 100644 --- a/Lib/fontTools/pens/basePen.py +++ b/Lib/fontTools/pens/basePen.py @@ -36,7 +36,6 @@ Coordinates are usually expressed as (x, y) tuples, but generally any sequence of length 2 will do. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.loggingTools import LogMixin diff --git a/Lib/fontTools/pens/boundsPen.py b/Lib/fontTools/pens/boundsPen.py index 3a103e312..c76efdfb8 100644 --- a/Lib/fontTools/pens/boundsPen.py +++ b/Lib/fontTools/pens/boundsPen.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.arrayTools import updateBounds, pointInRect, unionRect from fontTools.misc.bezierTools import calcCubicBounds, calcQuadraticBounds diff --git a/Lib/fontTools/pens/cocoaPen.py b/Lib/fontTools/pens/cocoaPen.py index 9920ab0f7..9ca6f3bb6 100644 --- a/Lib/fontTools/pens/cocoaPen.py +++ b/Lib/fontTools/pens/cocoaPen.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import BasePen diff --git a/Lib/fontTools/pens/filterPen.py b/Lib/fontTools/pens/filterPen.py index 2f9455075..0ebb9c23b 100644 --- a/Lib/fontTools/pens/filterPen.py +++ b/Lib/fontTools/pens/filterPen.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import AbstractPen from fontTools.pens.recordingPen import RecordingPen diff --git a/Lib/fontTools/pens/momentsPen.py b/Lib/fontTools/pens/momentsPen.py index b83102ccc..bc1df94c7 100644 --- a/Lib/fontTools/pens/momentsPen.py +++ b/Lib/fontTools/pens/momentsPen.py @@ -1,6 +1,5 @@ """Pen calculating 0th, 1st, and 2nd moments of area of glyph shapes. This is low-level, autogenerated pen. Use statisticsPen instead.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import BasePen diff --git a/Lib/fontTools/pens/perimeterPen.py b/Lib/fontTools/pens/perimeterPen.py index 12e7e47e5..36c7edb4d 100644 --- a/Lib/fontTools/pens/perimeterPen.py +++ b/Lib/fontTools/pens/perimeterPen.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- """Calculate the perimeter of a glyph.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import BasePen from fontTools.misc.bezierTools import approximateQuadraticArcLengthC, calcQuadraticArcLengthC, approximateCubicArcLengthC, calcCubicArcLengthC diff --git a/Lib/fontTools/pens/pointInsidePen.py b/Lib/fontTools/pens/pointInsidePen.py index 3311841bd..8de077c97 100644 --- a/Lib/fontTools/pens/pointInsidePen.py +++ b/Lib/fontTools/pens/pointInsidePen.py @@ -2,7 +2,6 @@ for shapes. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import BasePen from fontTools.misc.bezierTools import solveQuadratic, solveCubic diff --git a/Lib/fontTools/pens/pointPen.py b/Lib/fontTools/pens/pointPen.py index 6299e8637..db118681a 100644 --- a/Lib/fontTools/pens/pointPen.py +++ b/Lib/fontTools/pens/pointPen.py @@ -11,7 +11,6 @@ steps through all the points in a call from glyph.drawPoints(). This allows the caller to provide more data for each point. For instance, whether or not a point is smooth, and its name. """ -from __future__ import absolute_import, unicode_literals from fontTools.pens.basePen import AbstractPen import math diff --git a/Lib/fontTools/pens/qtPen.py b/Lib/fontTools/pens/qtPen.py index 01cb37a13..20d7e23a4 100644 --- a/Lib/fontTools/pens/qtPen.py +++ b/Lib/fontTools/pens/qtPen.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import BasePen diff --git a/Lib/fontTools/pens/recordingPen.py b/Lib/fontTools/pens/recordingPen.py index e583c8f2a..dbbcc916c 100644 --- a/Lib/fontTools/pens/recordingPen.py +++ b/Lib/fontTools/pens/recordingPen.py @@ -1,5 +1,4 @@ """Pen recording operations that can be accessed or replayed.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import AbstractPen, DecomposingPen diff --git a/Lib/fontTools/pens/reportLabPen.py b/Lib/fontTools/pens/reportLabPen.py index 2068b2555..51d213f73 100644 --- a/Lib/fontTools/pens/reportLabPen.py +++ b/Lib/fontTools/pens/reportLabPen.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import BasePen from reportlab.graphics.shapes import Path diff --git a/Lib/fontTools/pens/reverseContourPen.py b/Lib/fontTools/pens/reverseContourPen.py index 27e54d749..abc0fa290 100644 --- a/Lib/fontTools/pens/reverseContourPen.py +++ b/Lib/fontTools/pens/reverseContourPen.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.arrayTools import pairwise from fontTools.pens.filterPen import ContourFilterPen diff --git a/Lib/fontTools/pens/statisticsPen.py b/Lib/fontTools/pens/statisticsPen.py index 7c2e85c83..7d602067c 100644 --- a/Lib/fontTools/pens/statisticsPen.py +++ b/Lib/fontTools/pens/statisticsPen.py @@ -1,6 +1,5 @@ """Pen calculating area, center of mass, variance and standard-deviation, covariance and correlation, and slant, of glyph shapes.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import math from fontTools.pens.momentsPen import MomentsPen diff --git a/Lib/fontTools/pens/svgPathPen.py b/Lib/fontTools/pens/svgPathPen.py index 17e4cccc7..803f3935e 100644 --- a/Lib/fontTools/pens/svgPathPen.py +++ b/Lib/fontTools/pens/svgPathPen.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import BasePen diff --git a/Lib/fontTools/pens/t2CharStringPen.py b/Lib/fontTools/pens/t2CharStringPen.py index 2025fd55a..89340d1ee 100644 --- a/Lib/fontTools/pens/t2CharStringPen.py +++ b/Lib/fontTools/pens/t2CharStringPen.py @@ -1,7 +1,6 @@ # Copyright (c) 2009 Type Supply LLC # Author: Tal Leming -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import otRound from fontTools.misc.psCharStrings import T2CharString diff --git a/Lib/fontTools/pens/teePen.py b/Lib/fontTools/pens/teePen.py index ce22c850e..49420dca5 100644 --- a/Lib/fontTools/pens/teePen.py +++ b/Lib/fontTools/pens/teePen.py @@ -1,5 +1,4 @@ """Pen multiplexing drawing to one or more pens.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import AbstractPen diff --git a/Lib/fontTools/pens/transformPen.py b/Lib/fontTools/pens/transformPen.py index 8f4fcd08f..8d33a0865 100644 --- a/Lib/fontTools/pens/transformPen.py +++ b/Lib/fontTools/pens/transformPen.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.filterPen import FilterPen diff --git a/Lib/fontTools/pens/ttGlyphPen.py b/Lib/fontTools/pens/ttGlyphPen.py index 6e2f0d318..1f0830ef3 100644 --- a/Lib/fontTools/pens/ttGlyphPen.py +++ b/Lib/fontTools/pens/ttGlyphPen.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from array import array from fontTools.pens.basePen import LoggingPen diff --git a/Lib/fontTools/pens/wxPen.py b/Lib/fontTools/pens/wxPen.py index 8e0e46390..5ff6c4719 100644 --- a/Lib/fontTools/pens/wxPen.py +++ b/Lib/fontTools/pens/wxPen.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import BasePen diff --git a/Lib/fontTools/subset/__init__.py b/Lib/fontTools/subset/__init__.py index aee8a0fe9..e3e6f74d9 100644 --- a/Lib/fontTools/subset/__init__.py +++ b/Lib/fontTools/subset/__init__.py @@ -2,7 +2,6 @@ # # Google Author(s): Behdad Esfahbod -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import otRound from fontTools import ttLib diff --git a/Lib/fontTools/subset/__main__.py b/Lib/fontTools/subset/__main__.py index 10e470fe6..3f3d894a0 100644 --- a/Lib/fontTools/subset/__main__.py +++ b/Lib/fontTools/subset/__main__.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import sys from fontTools.subset import main diff --git a/Lib/fontTools/svgLib/__init__.py b/Lib/fontTools/svgLib/__init__.py index b301a3bab..ca5af1cf5 100644 --- a/Lib/fontTools/svgLib/__init__.py +++ b/Lib/fontTools/svgLib/__init__.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .path import SVGPath, parse_path diff --git a/Lib/fontTools/svgLib/path/__init__.py b/Lib/fontTools/svgLib/path/__init__.py index 5dd3329cf..9dc5ac61c 100644 --- a/Lib/fontTools/svgLib/path/__init__.py +++ b/Lib/fontTools/svgLib/path/__init__.py @@ -1,5 +1,3 @@ -from __future__ import ( - print_function, division, absolute_import, unicode_literals) from fontTools.misc.py23 import * from fontTools.pens.transformPen import TransformPen diff --git a/Lib/fontTools/svgLib/path/arc.py b/Lib/fontTools/svgLib/path/arc.py index 38d1ea9c8..25b9aa5e8 100644 --- a/Lib/fontTools/svgLib/path/arc.py +++ b/Lib/fontTools/svgLib/path/arc.py @@ -4,7 +4,6 @@ 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 __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.py23 import isfinite from fontTools.misc.transform import Identity, Scale diff --git a/Lib/fontTools/svgLib/path/parser.py b/Lib/fontTools/svgLib/path/parser.py index bdf3de0c6..e23d8aa8d 100644 --- a/Lib/fontTools/svgLib/path/parser.py +++ b/Lib/fontTools/svgLib/path/parser.py @@ -7,8 +7,6 @@ # Copyright (c) 2013-2014 Lennart Regebro # License: MIT -from __future__ import ( - print_function, division, absolute_import, unicode_literals) from fontTools.misc.py23 import * from .arc import EllipticalArc import re diff --git a/Lib/fontTools/t1Lib/__init__.py b/Lib/fontTools/t1Lib/__init__.py index 142cedd71..88729aec9 100644 --- a/Lib/fontTools/t1Lib/__init__.py +++ b/Lib/fontTools/t1Lib/__init__.py @@ -15,7 +15,6 @@ write(path, data, kind='OTHER', dohex=False) part should be written as hexadecimal or binary, but only if kind is 'OTHER'. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import eexec from fontTools.misc.macCreatorType import getMacCreatorAndType diff --git a/Lib/fontTools/ttLib/__init__.py b/Lib/fontTools/ttLib/__init__.py index a3ab303c2..7b01ddd4b 100644 --- a/Lib/fontTools/ttLib/__init__.py +++ b/Lib/fontTools/ttLib/__init__.py @@ -41,7 +41,6 @@ Dumping 'prep' table... """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.loggingTools import deprecateFunction import logging diff --git a/Lib/fontTools/ttLib/macUtils.py b/Lib/fontTools/ttLib/macUtils.py index 17dd5efef..6a7cb2e86 100644 --- a/Lib/fontTools/ttLib/macUtils.py +++ b/Lib/fontTools/ttLib/macUtils.py @@ -1,5 +1,4 @@ """ttLib.macUtils.py -- Various Mac-specific stuff.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.macRes import ResourceReader, ResourceError diff --git a/Lib/fontTools/ttLib/sfnt.py b/Lib/fontTools/ttLib/sfnt.py index 1c11de729..9be149e40 100644 --- a/Lib/fontTools/ttLib/sfnt.py +++ b/Lib/fontTools/ttLib/sfnt.py @@ -12,7 +12,6 @@ classes, since whenever to number of tables changes or whenever a table's length chages you need to rewrite the whole file anyway. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.ttLib import TTLibError diff --git a/Lib/fontTools/ttLib/standardGlyphOrder.py b/Lib/fontTools/ttLib/standardGlyphOrder.py index 510773a6c..9697fcc60 100644 --- a/Lib/fontTools/ttLib/standardGlyphOrder.py +++ b/Lib/fontTools/ttLib/standardGlyphOrder.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * # diff --git a/Lib/fontTools/ttLib/tables/B_A_S_E_.py b/Lib/fontTools/ttLib/tables/B_A_S_E_.py index 14906b403..6c4863adf 100644 --- a/Lib/fontTools/ttLib/tables/B_A_S_E_.py +++ b/Lib/fontTools/ttLib/tables/B_A_S_E_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/BitmapGlyphMetrics.py b/Lib/fontTools/ttLib/tables/BitmapGlyphMetrics.py index 685979a78..7e19b0117 100644 --- a/Lib/fontTools/ttLib/tables/BitmapGlyphMetrics.py +++ b/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 __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/C_B_D_T_.py b/Lib/fontTools/ttLib/tables/C_B_D_T_.py index ba02910da..6fd4143b0 100644 --- a/Lib/fontTools/ttLib/tables/C_B_D_T_.py +++ b/Lib/fontTools/ttLib/tables/C_B_D_T_.py @@ -3,7 +3,6 @@ # Google Author(s): Matt Fontaine -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from . import E_B_D_T_ diff --git a/Lib/fontTools/ttLib/tables/C_B_L_C_.py b/Lib/fontTools/ttLib/tables/C_B_L_C_.py index 3d67dd0c2..ed7e3aed4 100644 --- a/Lib/fontTools/ttLib/tables/C_B_L_C_.py +++ b/Lib/fontTools/ttLib/tables/C_B_L_C_.py @@ -2,7 +2,6 @@ # # Google Author(s): Matt Fontaine -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from . import E_B_L_C_ diff --git a/Lib/fontTools/ttLib/tables/C_F_F_.py b/Lib/fontTools/ttLib/tables/C_F_F_.py index f175d5c71..1d3860c96 100644 --- a/Lib/fontTools/ttLib/tables/C_F_F_.py +++ b/Lib/fontTools/ttLib/tables/C_F_F_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import cffLib from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/C_F_F__2.py b/Lib/fontTools/ttLib/tables/C_F_F__2.py index 7e30c8f4b..7aaf4ce68 100644 --- a/Lib/fontTools/ttLib/tables/C_F_F__2.py +++ b/Lib/fontTools/ttLib/tables/C_F_F__2.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import cffLib from fontTools.ttLib.tables.C_F_F_ import table_C_F_F_ diff --git a/Lib/fontTools/ttLib/tables/C_O_L_R_.py b/Lib/fontTools/ttLib/tables/C_O_L_R_.py index 441242ee7..064aa27f6 100644 --- a/Lib/fontTools/ttLib/tables/C_O_L_R_.py +++ b/Lib/fontTools/ttLib/tables/C_O_L_R_.py @@ -2,7 +2,6 @@ # # Google Author(s): Behdad Esfahbod -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import safeEval from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/C_P_A_L_.py b/Lib/fontTools/ttLib/tables/C_P_A_L_.py index f9d0c6435..f0415600c 100644 --- a/Lib/fontTools/ttLib/tables/C_P_A_L_.py +++ b/Lib/fontTools/ttLib/tables/C_P_A_L_.py @@ -2,7 +2,6 @@ # # Google Author(s): Behdad Esfahbod -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import safeEval from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/D_S_I_G_.py b/Lib/fontTools/ttLib/tables/D_S_I_G_.py index af802b956..d9a02ba24 100644 --- a/Lib/fontTools/ttLib/tables/D_S_I_G_.py +++ b/Lib/fontTools/ttLib/tables/D_S_I_G_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import safeEval from fontTools.misc import sstruct diff --git a/Lib/fontTools/ttLib/tables/DefaultTable.py b/Lib/fontTools/ttLib/tables/DefaultTable.py index 8ad36e16a..16f5da07c 100644 --- a/Lib/fontTools/ttLib/tables/DefaultTable.py +++ b/Lib/fontTools/ttLib/tables/DefaultTable.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import getClassTag diff --git a/Lib/fontTools/ttLib/tables/E_B_D_T_.py b/Lib/fontTools/ttLib/tables/E_B_D_T_.py index 3a316e5d0..e85a4cd1b 100644 --- a/Lib/fontTools/ttLib/tables/E_B_D_T_.py +++ b/Lib/fontTools/ttLib/tables/E_B_D_T_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval, readHex, hexStr, deHexStr diff --git a/Lib/fontTools/ttLib/tables/E_B_L_C_.py b/Lib/fontTools/ttLib/tables/E_B_L_C_.py index 8cf660079..224042d11 100644 --- a/Lib/fontTools/ttLib/tables/E_B_L_C_.py +++ b/Lib/fontTools/ttLib/tables/E_B_L_C_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/F_F_T_M_.py b/Lib/fontTools/ttLib/tables/F_F_T_M_.py index 3d110bdb6..20a12eca5 100644 --- a/Lib/fontTools/ttLib/tables/F_F_T_M_.py +++ b/Lib/fontTools/ttLib/tables/F_F_T_M_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/F__e_a_t.py b/Lib/fontTools/ttLib/tables/F__e_a_t.py index ec497f22a..6d3ae5101 100644 --- a/Lib/fontTools/ttLib/tables/F__e_a_t.py +++ b/Lib/fontTools/ttLib/tables/F__e_a_t.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/G_D_E_F_.py b/Lib/fontTools/ttLib/tables/G_D_E_F_.py index 08faf6272..5fb65d540 100644 --- a/Lib/fontTools/ttLib/tables/G_D_E_F_.py +++ b/Lib/fontTools/ttLib/tables/G_D_E_F_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/G_M_A_P_.py b/Lib/fontTools/ttLib/tables/G_M_A_P_.py index afa8c4dc0..ce3ac41f3 100644 --- a/Lib/fontTools/ttLib/tables/G_M_A_P_.py +++ b/Lib/fontTools/ttLib/tables/G_M_A_P_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/G_P_K_G_.py b/Lib/fontTools/ttLib/tables/G_P_K_G_.py index b835f4af7..634940078 100644 --- a/Lib/fontTools/ttLib/tables/G_P_K_G_.py +++ b/Lib/fontTools/ttLib/tables/G_P_K_G_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval, readHex diff --git a/Lib/fontTools/ttLib/tables/G_P_O_S_.py b/Lib/fontTools/ttLib/tables/G_P_O_S_.py index 1c36061c9..34d1ce145 100644 --- a/Lib/fontTools/ttLib/tables/G_P_O_S_.py +++ b/Lib/fontTools/ttLib/tables/G_P_O_S_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/G_S_U_B_.py b/Lib/fontTools/ttLib/tables/G_S_U_B_.py index d23e8ba1f..5ba87785a 100644 --- a/Lib/fontTools/ttLib/tables/G_S_U_B_.py +++ b/Lib/fontTools/ttLib/tables/G_S_U_B_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/G__l_a_t.py b/Lib/fontTools/ttLib/tables/G__l_a_t.py index b7e8281bc..8d2c4fca6 100644 --- a/Lib/fontTools/ttLib/tables/G__l_a_t.py +++ b/Lib/fontTools/ttLib/tables/G__l_a_t.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/G__l_o_c.py b/Lib/fontTools/ttLib/tables/G__l_o_c.py index 188637d8b..ac599ef54 100644 --- a/Lib/fontTools/ttLib/tables/G__l_o_c.py +++ b/Lib/fontTools/ttLib/tables/G__l_o_c.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/H_V_A_R_.py b/Lib/fontTools/ttLib/tables/H_V_A_R_.py index efab4e721..67d5a7bbb 100644 --- a/Lib/fontTools/ttLib/tables/H_V_A_R_.py +++ b/Lib/fontTools/ttLib/tables/H_V_A_R_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/J_S_T_F_.py b/Lib/fontTools/ttLib/tables/J_S_T_F_.py index dffd08b09..704f03040 100644 --- a/Lib/fontTools/ttLib/tables/J_S_T_F_.py +++ b/Lib/fontTools/ttLib/tables/J_S_T_F_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/L_T_S_H_.py b/Lib/fontTools/ttLib/tables/L_T_S_H_.py index dd0f1954e..032255cb5 100644 --- a/Lib/fontTools/ttLib/tables/L_T_S_H_.py +++ b/Lib/fontTools/ttLib/tables/L_T_S_H_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import safeEval from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/M_A_T_H_.py b/Lib/fontTools/ttLib/tables/M_A_T_H_.py index 8c329ba59..7bf9098e4 100644 --- a/Lib/fontTools/ttLib/tables/M_A_T_H_.py +++ b/Lib/fontTools/ttLib/tables/M_A_T_H_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/M_E_T_A_.py b/Lib/fontTools/ttLib/tables/M_E_T_A_.py index 3eb6550da..862487f74 100644 --- a/Lib/fontTools/ttLib/tables/M_E_T_A_.py +++ b/Lib/fontTools/ttLib/tables/M_E_T_A_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/M_V_A_R_.py b/Lib/fontTools/ttLib/tables/M_V_A_R_.py index 8659ae836..4bae5afe3 100644 --- a/Lib/fontTools/ttLib/tables/M_V_A_R_.py +++ b/Lib/fontTools/ttLib/tables/M_V_A_R_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/O_S_2f_2.py b/Lib/fontTools/ttLib/tables/O_S_2f_2.py index 107d8590e..078f5167f 100644 --- a/Lib/fontTools/ttLib/tables/O_S_2f_2.py +++ b/Lib/fontTools/ttLib/tables/O_S_2f_2.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval, num2binary, binary2num diff --git a/Lib/fontTools/ttLib/tables/S_I_N_G_.py b/Lib/fontTools/ttLib/tables/S_I_N_G_.py index 413ae4844..619924236 100644 --- a/Lib/fontTools/ttLib/tables/S_I_N_G_.py +++ b/Lib/fontTools/ttLib/tables/S_I_N_G_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/S_T_A_T_.py b/Lib/fontTools/ttLib/tables/S_T_A_T_.py index 1e044cf1b..c8278e0ce 100644 --- a/Lib/fontTools/ttLib/tables/S_T_A_T_.py +++ b/Lib/fontTools/ttLib/tables/S_T_A_T_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/S_V_G_.py b/Lib/fontTools/ttLib/tables/S_V_G_.py index b0611531d..89551cdab 100644 --- a/Lib/fontTools/ttLib/tables/S_V_G_.py +++ b/Lib/fontTools/ttLib/tables/S_V_G_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/S__i_l_f.py b/Lib/fontTools/ttLib/tables/S__i_l_f.py index 00d5f616f..2359942de 100644 --- a/Lib/fontTools/ttLib/tables/S__i_l_f.py +++ b/Lib/fontTools/ttLib/tables/S__i_l_f.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/S__i_l_l.py b/Lib/fontTools/ttLib/tables/S__i_l_l.py index bf9d83f5b..4fdf05390 100644 --- a/Lib/fontTools/ttLib/tables/S__i_l_l.py +++ b/Lib/fontTools/ttLib/tables/S__i_l_l.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/T_S_I_B_.py b/Lib/fontTools/ttLib/tables/T_S_I_B_.py index 7d47e3a2c..88b001592 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_B_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_B_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .T_S_I_V_ import table_T_S_I_V_ diff --git a/Lib/fontTools/ttLib/tables/T_S_I_C_.py b/Lib/fontTools/ttLib/tables/T_S_I_C_.py index b4684a467..4f4763f36 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_C_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_C_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/T_S_I_D_.py b/Lib/fontTools/ttLib/tables/T_S_I_D_.py index f989c9ed2..1fd3cb120 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_D_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_D_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .T_S_I_V_ import table_T_S_I_V_ diff --git a/Lib/fontTools/ttLib/tables/T_S_I_J_.py b/Lib/fontTools/ttLib/tables/T_S_I_J_.py index ca538ba9a..462ad89e5 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_J_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_J_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .T_S_I_V_ import table_T_S_I_V_ diff --git a/Lib/fontTools/ttLib/tables/T_S_I_P_.py b/Lib/fontTools/ttLib/tables/T_S_I_P_.py index 062d3327f..06d57354f 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_P_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_P_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .T_S_I_V_ import table_T_S_I_V_ diff --git a/Lib/fontTools/ttLib/tables/T_S_I_S_.py b/Lib/fontTools/ttLib/tables/T_S_I_S_.py index 68e22cedd..27fcac766 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_S_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_S_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .T_S_I_V_ import table_T_S_I_V_ diff --git a/Lib/fontTools/ttLib/tables/T_S_I_V_.py b/Lib/fontTools/ttLib/tables/T_S_I_V_.py index 46b2182e4..1939cdc7b 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_V_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_V_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from . import asciiTable diff --git a/Lib/fontTools/ttLib/tables/T_S_I__0.py b/Lib/fontTools/ttLib/tables/T_S_I__0.py index 81808eeab..04f58cddc 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I__0.py +++ b/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 __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from . import DefaultTable import struct diff --git a/Lib/fontTools/ttLib/tables/T_S_I__1.py b/Lib/fontTools/ttLib/tables/T_S_I__1.py index 5ef944af8..b014cb4bd 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I__1.py +++ b/Lib/fontTools/ttLib/tables/T_S_I__1.py @@ -4,7 +4,6 @@ tool to store its hinting source data. TSI1 contains the text of the glyph programs in the form of low-level assembly code, as well as the 'extra' programs 'fpgm', 'ppgm' (i.e. 'prep'), and 'cvt'. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from . import DefaultTable from fontTools.misc.loggingTools import LogMixin diff --git a/Lib/fontTools/ttLib/tables/T_S_I__2.py b/Lib/fontTools/ttLib/tables/T_S_I__2.py index 7d41ee881..f7206d083 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I__2.py +++ b/Lib/fontTools/ttLib/tables/T_S_I__2.py @@ -5,7 +5,6 @@ TSI2 is the index table containing the lengths and offsets for the glyph programs that are contained in the TSI3 table. It uses the same format as the TSI0 table. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import ttLib diff --git a/Lib/fontTools/ttLib/tables/T_S_I__3.py b/Lib/fontTools/ttLib/tables/T_S_I__3.py index ee95d06fe..92e0e53e3 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I__3.py +++ b/Lib/fontTools/ttLib/tables/T_S_I__3.py @@ -3,7 +3,6 @@ tool to store its hinting source data. TSI3 contains the text of the glyph programs in the form of 'VTTTalk' code. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import ttLib diff --git a/Lib/fontTools/ttLib/tables/T_S_I__5.py b/Lib/fontTools/ttLib/tables/T_S_I__5.py index 61b76044c..6ba07f65b 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I__5.py +++ b/Lib/fontTools/ttLib/tables/T_S_I__5.py @@ -3,7 +3,6 @@ tool to store its hinting source data. TSI5 contains the VTT character groups. """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import safeEval from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/T_T_F_A_.py b/Lib/fontTools/ttLib/tables/T_T_F_A_.py index 8ff8d1b38..3fdbd0702 100644 --- a/Lib/fontTools/ttLib/tables/T_T_F_A_.py +++ b/Lib/fontTools/ttLib/tables/T_T_F_A_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from . import asciiTable diff --git a/Lib/fontTools/ttLib/tables/TupleVariation.py b/Lib/fontTools/ttLib/tables/TupleVariation.py index fb2131b2b..33edeb415 100644 --- a/Lib/fontTools/ttLib/tables/TupleVariation.py +++ b/Lib/fontTools/ttLib/tables/TupleVariation.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import fixedToFloat, floatToFixed, otRound from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/V_D_M_X_.py b/Lib/fontTools/ttLib/tables/V_D_M_X_.py index abca3bf1d..b4028c35f 100644 --- a/Lib/fontTools/ttLib/tables/V_D_M_X_.py +++ b/Lib/fontTools/ttLib/tables/V_D_M_X_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from . import DefaultTable from fontTools.misc import sstruct diff --git a/Lib/fontTools/ttLib/tables/V_O_R_G_.py b/Lib/fontTools/ttLib/tables/V_O_R_G_.py index 1b7529406..bbc6d0221 100644 --- a/Lib/fontTools/ttLib/tables/V_O_R_G_.py +++ b/Lib/fontTools/ttLib/tables/V_O_R_G_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import safeEval from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/V_V_A_R_.py b/Lib/fontTools/ttLib/tables/V_V_A_R_.py index 530f0e3af..b835fc162 100644 --- a/Lib/fontTools/ttLib/tables/V_V_A_R_.py +++ b/Lib/fontTools/ttLib/tables/V_V_A_R_.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/__init__.py b/Lib/fontTools/ttLib/tables/__init__.py index 79a50fdc1..0c99c22e9 100644 --- a/Lib/fontTools/ttLib/tables/__init__.py +++ b/Lib/fontTools/ttLib/tables/__init__.py @@ -1,5 +1,3 @@ - -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * # DON'T EDIT! This file is generated by MetaTools/buildTableList.py. diff --git a/Lib/fontTools/ttLib/tables/_a_n_k_r.py b/Lib/fontTools/ttLib/tables/_a_n_k_r.py index 3a1aa08dd..9372168d8 100644 --- a/Lib/fontTools/ttLib/tables/_a_n_k_r.py +++ b/Lib/fontTools/ttLib/tables/_a_n_k_r.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/_a_v_a_r.py b/Lib/fontTools/ttLib/tables/_a_v_a_r.py index 57601c5d2..93add7235 100644 --- a/Lib/fontTools/ttLib/tables/_a_v_a_r.py +++ b/Lib/fontTools/ttLib/tables/_a_v_a_r.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import ttLib from fontTools.misc import sstruct diff --git a/Lib/fontTools/ttLib/tables/_b_s_l_n.py b/Lib/fontTools/ttLib/tables/_b_s_l_n.py index 31d839959..8c0e39eab 100644 --- a/Lib/fontTools/ttLib/tables/_b_s_l_n.py +++ b/Lib/fontTools/ttLib/tables/_b_s_l_n.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/_c_i_d_g.py b/Lib/fontTools/ttLib/tables/_c_i_d_g.py index 1d6c50284..b9722563c 100644 --- a/Lib/fontTools/ttLib/tables/_c_i_d_g.py +++ b/Lib/fontTools/ttLib/tables/_c_i_d_g.py @@ -1,5 +1,4 @@ # coding: utf-8 -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/_c_m_a_p.py b/Lib/fontTools/ttLib/tables/_c_m_a_p.py index 971a3163b..afd5d5e65 100644 --- a/Lib/fontTools/ttLib/tables/_c_m_a_p.py +++ b/Lib/fontTools/ttLib/tables/_c_m_a_p.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import safeEval, readHex from fontTools.misc.encodingTools import getEncoding diff --git a/Lib/fontTools/ttLib/tables/_c_v_a_r.py b/Lib/fontTools/ttLib/tables/_c_v_a_r.py index c4ebbc929..e336d2487 100644 --- a/Lib/fontTools/ttLib/tables/_c_v_a_r.py +++ b/Lib/fontTools/ttLib/tables/_c_v_a_r.py @@ -1,5 +1,3 @@ -from __future__ import \ - print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from . import DefaultTable from fontTools.misc import sstruct diff --git a/Lib/fontTools/ttLib/tables/_c_v_t.py b/Lib/fontTools/ttLib/tables/_c_v_t.py index 21df0bad8..70418ca70 100644 --- a/Lib/fontTools/ttLib/tables/_c_v_t.py +++ b/Lib/fontTools/ttLib/tables/_c_v_t.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import safeEval from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/_f_e_a_t.py b/Lib/fontTools/ttLib/tables/_f_e_a_t.py index 371527142..35344fddf 100644 --- a/Lib/fontTools/ttLib/tables/_f_e_a_t.py +++ b/Lib/fontTools/ttLib/tables/_f_e_a_t.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/_f_p_g_m.py b/Lib/fontTools/ttLib/tables/_f_p_g_m.py index 6536dba99..77fdc6d06 100644 --- a/Lib/fontTools/ttLib/tables/_f_p_g_m.py +++ b/Lib/fontTools/ttLib/tables/_f_p_g_m.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from . import DefaultTable from . import ttProgram diff --git a/Lib/fontTools/ttLib/tables/_f_v_a_r.py b/Lib/fontTools/ttLib/tables/_f_v_a_r.py index 3bc46e245..2f44085e5 100644 --- a/Lib/fontTools/ttLib/tables/_f_v_a_r.py +++ b/Lib/fontTools/ttLib/tables/_f_v_a_r.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.fixedTools import fixedToFloat, floatToFixed diff --git a/Lib/fontTools/ttLib/tables/_g_a_s_p.py b/Lib/fontTools/ttLib/tables/_g_a_s_p.py index dce356912..b49ccb59c 100644 --- a/Lib/fontTools/ttLib/tables/_g_a_s_p.py +++ b/Lib/fontTools/ttLib/tables/_g_a_s_p.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import safeEval from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/_g_c_i_d.py b/Lib/fontTools/ttLib/tables/_g_c_i_d.py index f8b57e2ac..b2da40af8 100644 --- a/Lib/fontTools/ttLib/tables/_g_c_i_d.py +++ b/Lib/fontTools/ttLib/tables/_g_c_i_d.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/_g_l_y_f.py b/Lib/fontTools/ttLib/tables/_g_l_y_f.py index 6d3c80b7d..a1e36fd36 100644 --- a/Lib/fontTools/ttLib/tables/_g_l_y_f.py +++ b/Lib/fontTools/ttLib/tables/_g_l_y_f.py @@ -1,6 +1,5 @@ """_g_l_y_f.py -- Converter classes for the 'glyf' table.""" -from __future__ import print_function, division, absolute_import from collections import namedtuple from fontTools.misc.py23 import * from fontTools.misc import sstruct diff --git a/Lib/fontTools/ttLib/tables/_g_v_a_r.py b/Lib/fontTools/ttLib/tables/_g_v_a_r.py index 7a02f8f5b..7a327c9c7 100644 --- a/Lib/fontTools/ttLib/tables/_g_v_a_r.py +++ b/Lib/fontTools/ttLib/tables/_g_v_a_r.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import ttLib from fontTools.misc import sstruct diff --git a/Lib/fontTools/ttLib/tables/_h_d_m_x.py b/Lib/fontTools/ttLib/tables/_h_d_m_x.py index e073325a8..a42cb6a73 100644 --- a/Lib/fontTools/ttLib/tables/_h_d_m_x.py +++ b/Lib/fontTools/ttLib/tables/_h_d_m_x.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/_h_e_a_d.py b/Lib/fontTools/ttLib/tables/_h_e_a_d.py index 42fbb1d49..676489c4f 100644 --- a/Lib/fontTools/ttLib/tables/_h_e_a_d.py +++ b/Lib/fontTools/ttLib/tables/_h_e_a_d.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval, num2binary, binary2num diff --git a/Lib/fontTools/ttLib/tables/_h_h_e_a.py b/Lib/fontTools/ttLib/tables/_h_h_e_a.py index bde9073cb..2520fb3b7 100644 --- a/Lib/fontTools/ttLib/tables/_h_h_e_a.py +++ b/Lib/fontTools/ttLib/tables/_h_h_e_a.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/_h_m_t_x.py b/Lib/fontTools/ttLib/tables/_h_m_t_x.py index 24cad4f72..56b2913de 100644 --- a/Lib/fontTools/ttLib/tables/_h_m_t_x.py +++ b/Lib/fontTools/ttLib/tables/_h_m_t_x.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import otRound from fontTools import ttLib diff --git a/Lib/fontTools/ttLib/tables/_k_e_r_n.py b/Lib/fontTools/ttLib/tables/_k_e_r_n.py index 1e5140bc8..39e659233 100644 --- a/Lib/fontTools/ttLib/tables/_k_e_r_n.py +++ b/Lib/fontTools/ttLib/tables/_k_e_r_n.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import getSearchRange from fontTools.misc.textTools import safeEval, readHex diff --git a/Lib/fontTools/ttLib/tables/_l_c_a_r.py b/Lib/fontTools/ttLib/tables/_l_c_a_r.py index 4b9c85442..a3ee0dd21 100644 --- a/Lib/fontTools/ttLib/tables/_l_c_a_r.py +++ b/Lib/fontTools/ttLib/tables/_l_c_a_r.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/_l_o_c_a.py b/Lib/fontTools/ttLib/tables/_l_o_c_a.py index 6aa530308..5324f67c2 100644 --- a/Lib/fontTools/ttLib/tables/_l_o_c_a.py +++ b/Lib/fontTools/ttLib/tables/_l_o_c_a.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from . import DefaultTable import sys diff --git a/Lib/fontTools/ttLib/tables/_l_t_a_g.py b/Lib/fontTools/ttLib/tables/_l_t_a_g.py index 59f8e721b..011c46be4 100644 --- a/Lib/fontTools/ttLib/tables/_l_t_a_g.py +++ b/Lib/fontTools/ttLib/tables/_l_t_a_g.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import safeEval from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/_m_a_x_p.py b/Lib/fontTools/ttLib/tables/_m_a_x_p.py index 7da30b43a..fc1e69dd6 100644 --- a/Lib/fontTools/ttLib/tables/_m_a_x_p.py +++ b/Lib/fontTools/ttLib/tables/_m_a_x_p.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/_m_e_t_a.py b/Lib/fontTools/ttLib/tables/_m_e_t_a.py index cc19fe6ef..de5442045 100644 --- a/Lib/fontTools/ttLib/tables/_m_e_t_a.py +++ b/Lib/fontTools/ttLib/tables/_m_e_t_a.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import readHex diff --git a/Lib/fontTools/ttLib/tables/_m_o_r_t.py b/Lib/fontTools/ttLib/tables/_m_o_r_t.py index b87b42541..ea86ba8d6 100644 --- a/Lib/fontTools/ttLib/tables/_m_o_r_t.py +++ b/Lib/fontTools/ttLib/tables/_m_o_r_t.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/_m_o_r_x.py b/Lib/fontTools/ttLib/tables/_m_o_r_x.py index 1619d8d6a..e64e2b81c 100644 --- a/Lib/fontTools/ttLib/tables/_m_o_r_x.py +++ b/Lib/fontTools/ttLib/tables/_m_o_r_x.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/_n_a_m_e.py b/Lib/fontTools/ttLib/tables/_n_a_m_e.py index 488c4ea5f..6bca7f24d 100644 --- a/Lib/fontTools/ttLib/tables/_n_a_m_e.py +++ b/Lib/fontTools/ttLib/tables/_n_a_m_e.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/_o_p_b_d.py b/Lib/fontTools/ttLib/tables/_o_p_b_d.py index 60bb6c522..a8768968a 100644 --- a/Lib/fontTools/ttLib/tables/_o_p_b_d.py +++ b/Lib/fontTools/ttLib/tables/_o_p_b_d.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/_p_o_s_t.py b/Lib/fontTools/ttLib/tables/_p_o_s_t.py index 4874ecd94..e83bed72c 100644 --- a/Lib/fontTools/ttLib/tables/_p_o_s_t.py +++ b/Lib/fontTools/ttLib/tables/_p_o_s_t.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import ttLib from fontTools.ttLib.standardGlyphOrder import standardGlyphOrder diff --git a/Lib/fontTools/ttLib/tables/_p_r_e_p.py b/Lib/fontTools/ttLib/tables/_p_r_e_p.py index f4e892541..b66ad1bf5 100644 --- a/Lib/fontTools/ttLib/tables/_p_r_e_p.py +++ b/Lib/fontTools/ttLib/tables/_p_r_e_p.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import ttLib diff --git a/Lib/fontTools/ttLib/tables/_p_r_o_p.py b/Lib/fontTools/ttLib/tables/_p_r_o_p.py index 7da18eab8..7b4738a3f 100644 --- a/Lib/fontTools/ttLib/tables/_p_r_o_p.py +++ b/Lib/fontTools/ttLib/tables/_p_r_o_p.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .otBase import BaseTTXConverter diff --git a/Lib/fontTools/ttLib/tables/_s_b_i_x.py b/Lib/fontTools/ttLib/tables/_s_b_i_x.py index 6efd1f2f4..0bfabca4a 100644 --- a/Lib/fontTools/ttLib/tables/_s_b_i_x.py +++ b/Lib/fontTools/ttLib/tables/_s_b_i_x.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval, num2binary, binary2num diff --git a/Lib/fontTools/ttLib/tables/_t_r_a_k.py b/Lib/fontTools/ttLib/tables/_t_r_a_k.py index b5820b27b..66faea14d 100644 --- a/Lib/fontTools/ttLib/tables/_t_r_a_k.py +++ b/Lib/fontTools/ttLib/tables/_t_r_a_k.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.fixedTools import fixedToFloat as fi2fl, floatToFixed as fl2fi diff --git a/Lib/fontTools/ttLib/tables/_v_h_e_a.py b/Lib/fontTools/ttLib/tables/_v_h_e_a.py index 312c5eca5..2fc4b013e 100644 --- a/Lib/fontTools/ttLib/tables/_v_h_e_a.py +++ b/Lib/fontTools/ttLib/tables/_v_h_e_a.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval diff --git a/Lib/fontTools/ttLib/tables/_v_m_t_x.py b/Lib/fontTools/ttLib/tables/_v_m_t_x.py index 5573225c1..761a4c9a5 100644 --- a/Lib/fontTools/ttLib/tables/_v_m_t_x.py +++ b/Lib/fontTools/ttLib/tables/_v_m_t_x.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import ttLib diff --git a/Lib/fontTools/ttLib/tables/asciiTable.py b/Lib/fontTools/ttLib/tables/asciiTable.py index 87266a08a..0ad83ebe7 100644 --- a/Lib/fontTools/ttLib/tables/asciiTable.py +++ b/Lib/fontTools/ttLib/tables/asciiTable.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from . import DefaultTable diff --git a/Lib/fontTools/ttLib/tables/otBase.py b/Lib/fontTools/ttLib/tables/otBase.py index 816f1cd0a..521a98ebd 100644 --- a/Lib/fontTools/ttLib/tables/otBase.py +++ b/Lib/fontTools/ttLib/tables/otBase.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from .DefaultTable import DefaultTable import sys diff --git a/Lib/fontTools/ttLib/tables/otConverters.py b/Lib/fontTools/ttLib/tables/otConverters.py index d1712db86..1170bdb94 100644 --- a/Lib/fontTools/ttLib/tables/otConverters.py +++ b/Lib/fontTools/ttLib/tables/otConverters.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import ( fixedToFloat as fi2fl, floatToFixed as fl2fi, ensureVersionIsLong as fi2ve, diff --git a/Lib/fontTools/ttLib/tables/otData.py b/Lib/fontTools/ttLib/tables/otData.py index d08bcc57d..49f55d00c 100755 --- a/Lib/fontTools/ttLib/tables/otData.py +++ b/Lib/fontTools/ttLib/tables/otData.py @@ -1,5 +1,4 @@ # coding: utf-8 -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * otData = [ diff --git a/Lib/fontTools/ttLib/tables/otTables.py b/Lib/fontTools/ttLib/tables/otTables.py index 737e56154..376371b33 100644 --- a/Lib/fontTools/ttLib/tables/otTables.py +++ b/Lib/fontTools/ttLib/tables/otTables.py @@ -5,7 +5,6 @@ OpenType subtables. Most are constructed upon import from data in otData.py, all are populated with converter objects from otConverters.py. """ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.textTools import pad, safeEval from .otBase import BaseTable, FormatSwitchingBaseTable, ValueRecord diff --git a/Lib/fontTools/ttLib/tables/sbixGlyph.py b/Lib/fontTools/ttLib/tables/sbixGlyph.py index c05390869..c27ecfe2d 100644 --- a/Lib/fontTools/ttLib/tables/sbixGlyph.py +++ b/Lib/fontTools/ttLib/tables/sbixGlyph.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import readHex, safeEval diff --git a/Lib/fontTools/ttLib/tables/sbixStrike.py b/Lib/fontTools/ttLib/tables/sbixStrike.py index 6c1ac7749..7e3e17e8b 100644 --- a/Lib/fontTools/ttLib/tables/sbixStrike.py +++ b/Lib/fontTools/ttLib/tables/sbixStrike.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.textTools import readHex diff --git a/Lib/fontTools/ttLib/tables/ttProgram.py b/Lib/fontTools/ttLib/tables/ttProgram.py index 7ffb37a02..80a07acc3 100644 --- a/Lib/fontTools/ttLib/tables/ttProgram.py +++ b/Lib/fontTools/ttLib/tables/ttProgram.py @@ -1,6 +1,5 @@ """ttLib.tables.ttProgram.py -- Assembler/disassembler for TrueType bytecode programs.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import num2binary, binary2num, readHex import array diff --git a/Lib/fontTools/ttLib/ttCollection.py b/Lib/fontTools/ttLib/ttCollection.py index 2507fe306..ab885b87b 100644 --- a/Lib/fontTools/ttLib/ttCollection.py +++ b/Lib/fontTools/ttLib/ttCollection.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib.ttFont import TTFont from fontTools.ttLib.sfnt import readTTCHeader, writeTTCHeader diff --git a/Lib/fontTools/ttLib/ttFont.py b/Lib/fontTools/ttLib/ttFont.py index dca0b5158..fd8f718f6 100644 --- a/Lib/fontTools/ttLib/ttFont.py +++ b/Lib/fontTools/ttLib/ttFont.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc import xmlWriter from fontTools.misc.py23 import * from fontTools.misc.loggingTools import deprecateArgument diff --git a/Lib/fontTools/ttLib/woff2.py b/Lib/fontTools/ttLib/woff2.py index 56b119a7c..755b3e604 100644 --- a/Lib/fontTools/ttLib/woff2.py +++ b/Lib/fontTools/ttLib/woff2.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import sys import array diff --git a/Lib/fontTools/ttx.py b/Lib/fontTools/ttx.py index 8f598f8a8..faacbedbe 100644 --- a/Lib/fontTools/ttx.py +++ b/Lib/fontTools/ttx.py @@ -86,7 +86,6 @@ usage: ttx [options] inputfile1 [... inputfileN] """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont, TTLibError from fontTools.misc.macCreatorType import getMacCreatorAndType diff --git a/Lib/fontTools/ufoLib/__init__.py b/Lib/fontTools/ufoLib/__init__.py index 4a1fa864d..9064508c0 100755 --- a/Lib/fontTools/ufoLib/__init__.py +++ b/Lib/fontTools/ufoLib/__init__.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, unicode_literals import sys import os from copy import deepcopy diff --git a/Lib/fontTools/ufoLib/converters.py b/Lib/fontTools/ufoLib/converters.py index c9ec99066..0e2dae1a0 100644 --- a/Lib/fontTools/ufoLib/converters.py +++ b/Lib/fontTools/ufoLib/converters.py @@ -2,7 +2,6 @@ Conversion functions. """ -from __future__ import absolute_import, unicode_literals # adapted from the UFO spec diff --git a/Lib/fontTools/ufoLib/errors.py b/Lib/fontTools/ufoLib/errors.py index fb048d1c0..53a65bfd7 100644 --- a/Lib/fontTools/ufoLib/errors.py +++ b/Lib/fontTools/ufoLib/errors.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, unicode_literals class UFOLibError(Exception): diff --git a/Lib/fontTools/ufoLib/filenames.py b/Lib/fontTools/ufoLib/filenames.py index 1c5630f0d..a00131d0f 100644 --- a/Lib/fontTools/ufoLib/filenames.py +++ b/Lib/fontTools/ufoLib/filenames.py @@ -2,7 +2,6 @@ User name to file name conversion. This was taken form the UFO 3 spec. """ -from __future__ import absolute_import, unicode_literals from fontTools.misc.py23 import basestring, unicode diff --git a/Lib/fontTools/ufoLib/glifLib.py b/Lib/fontTools/ufoLib/glifLib.py index 99dd2cfa1..35666ea75 100755 --- a/Lib/fontTools/ufoLib/glifLib.py +++ b/Lib/fontTools/ufoLib/glifLib.py @@ -11,7 +11,6 @@ in a folder. It offers two ways to read glyph data, and one way to write glyph data. See the class doc string for details. """ -from __future__ import absolute_import, unicode_literals from warnings import warn from collections import OrderedDict import fs diff --git a/Lib/fontTools/ufoLib/kerning.py b/Lib/fontTools/ufoLib/kerning.py index 03e413fa3..947222a43 100644 --- a/Lib/fontTools/ufoLib/kerning.py +++ b/Lib/fontTools/ufoLib/kerning.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, unicode_literals def lookupKerningValue(pair, kerning, groups, fallback=0, glyphToFirstGroup=None, glyphToSecondGroup=None): diff --git a/Lib/fontTools/ufoLib/utils.py b/Lib/fontTools/ufoLib/utils.py index 77e2f92a8..1bc619923 100644 --- a/Lib/fontTools/ufoLib/utils.py +++ b/Lib/fontTools/ufoLib/utils.py @@ -1,7 +1,6 @@ """The module contains miscellaneous helpers. It's not considered part of the public ufoLib API. """ -from __future__ import absolute_import, unicode_literals import sys import warnings import functools diff --git a/Lib/fontTools/ufoLib/validators.py b/Lib/fontTools/ufoLib/validators.py index 844b7f1b5..8961ebd14 100644 --- a/Lib/fontTools/ufoLib/validators.py +++ b/Lib/fontTools/ufoLib/validators.py @@ -1,6 +1,5 @@ """Various low level data validators.""" -from __future__ import absolute_import, unicode_literals import calendar from io import open import fs.base diff --git a/Lib/fontTools/unicode.py b/Lib/fontTools/unicode.py index ef3ed695d..23589db7b 100644 --- a/Lib/fontTools/unicode.py +++ b/Lib/fontTools/unicode.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * def _makeunicodes(f): diff --git a/Lib/fontTools/unicodedata/__init__.py b/Lib/fontTools/unicodedata/__init__.py index 79462c76d..89528d79b 100644 --- a/Lib/fontTools/unicodedata/__init__.py +++ b/Lib/fontTools/unicodedata/__init__.py @@ -1,5 +1,3 @@ -from __future__ import ( - print_function, division, absolute_import, unicode_literals) from fontTools.misc.py23 import * import re diff --git a/Lib/fontTools/varLib/__init__.py b/Lib/fontTools/varLib/__init__.py index 5a881495f..59d060720 100644 --- a/Lib/fontTools/varLib/__init__.py +++ b/Lib/fontTools/varLib/__init__.py @@ -18,8 +18,6 @@ Then you can make a variable-font this way: API *will* change in near future. """ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.misc.fixedTools import otRound from fontTools.misc.arrayTools import Vector diff --git a/Lib/fontTools/varLib/__main__.py b/Lib/fontTools/varLib/__main__.py index 5cf05e523..5dbad5d4f 100644 --- a/Lib/fontTools/varLib/__main__.py +++ b/Lib/fontTools/varLib/__main__.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import sys from fontTools.varLib import main diff --git a/Lib/fontTools/varLib/builder.py b/Lib/fontTools/varLib/builder.py index 43fb92a1f..152336b06 100644 --- a/Lib/fontTools/varLib/builder.py +++ b/Lib/fontTools/varLib/builder.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools import ttLib from fontTools.ttLib.tables import otTables as ot diff --git a/Lib/fontTools/varLib/featureVars.py b/Lib/fontTools/varLib/featureVars.py index 0c6913d31..47b4e9b11 100644 --- a/Lib/fontTools/varLib/featureVars.py +++ b/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 __future__ import print_function, absolute_import, division from fontTools.misc.py23 import * from fontTools.misc.dictTools import hashdict from fontTools.misc.intTools import popCount diff --git a/Lib/fontTools/varLib/instancer.py b/Lib/fontTools/varLib/instancer.py index 52d62c998..db6f40d4d 100644 --- a/Lib/fontTools/varLib/instancer.py +++ b/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 __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import floatToFixedToFloat, otRound from fontTools.varLib.models import supportScalar, normalizeValue, piecewiseLinearMap diff --git a/Lib/fontTools/varLib/interpolatable.py b/Lib/fontTools/varLib/interpolatable.py index d4feed277..f7ba6404f 100644 --- a/Lib/fontTools/varLib/interpolatable.py +++ b/Lib/fontTools/varLib/interpolatable.py @@ -6,7 +6,6 @@ Call as: $ fonttools varLib.interpolatable font1 font2 ... """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import AbstractPen, BasePen diff --git a/Lib/fontTools/varLib/interpolate_layout.py b/Lib/fontTools/varLib/interpolate_layout.py index f252149a5..a007a1b25 100644 --- a/Lib/fontTools/varLib/interpolate_layout.py +++ b/Lib/fontTools/varLib/interpolate_layout.py @@ -1,7 +1,6 @@ """ Interpolate OpenType Layout tables (GDEF / GPOS / GSUB). """ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont from fontTools.varLib import models, VarLibError, load_designspace, load_masters diff --git a/Lib/fontTools/varLib/iup.py b/Lib/fontTools/varLib/iup.py index fc36a9f5d..91dc4d4a1 100644 --- a/Lib/fontTools/varLib/iup.py +++ b/Lib/fontTools/varLib/iup.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * diff --git a/Lib/fontTools/varLib/merger.py b/Lib/fontTools/varLib/merger.py index 9b5af5cad..44138b334 100644 --- a/Lib/fontTools/varLib/merger.py +++ b/Lib/fontTools/varLib/merger.py @@ -1,7 +1,6 @@ """ Merge OpenType Layout tables (GDEF / GPOS / GSUB). """ -from __future__ import print_function, division, absolute_import import copy from operator import ior from fontTools.misc.py23 import * diff --git a/Lib/fontTools/varLib/models.py b/Lib/fontTools/varLib/models.py index 9d969d73f..6bda4884a 100644 --- a/Lib/fontTools/varLib/models.py +++ b/Lib/fontTools/varLib/models.py @@ -1,5 +1,4 @@ """Variation fonts interpolation models.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * __all__ = ['nonNone', 'allNone', 'allEqual', 'allEqualTo', 'subList', diff --git a/Lib/fontTools/varLib/mutator.py b/Lib/fontTools/varLib/mutator.py index aba327167..13f32359d 100644 --- a/Lib/fontTools/varLib/mutator.py +++ b/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 __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import floatToFixedToFloat, otRound, floatToFixed from fontTools.pens.boundsPen import BoundsPen diff --git a/Lib/fontTools/varLib/mvar.py b/Lib/fontTools/varLib/mvar.py index 92083dd70..ecce736d7 100644 --- a/Lib/fontTools/varLib/mvar.py +++ b/Lib/fontTools/varLib/mvar.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * MVAR_ENTRIES = { diff --git a/Lib/fontTools/varLib/plot.py b/Lib/fontTools/varLib/plot.py index 6b134160e..b37267294 100644 --- a/Lib/fontTools/varLib/plot.py +++ b/Lib/fontTools/varLib/plot.py @@ -1,6 +1,5 @@ """Visualize DesignSpaceDocument and resulting VariationModel.""" -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.varLib.models import VariationModel, supportScalar from fontTools.designspaceLib import DesignSpaceDocument diff --git a/Lib/fontTools/varLib/varStore.py b/Lib/fontTools/varLib/varStore.py index d9d48a513..50512ee84 100644 --- a/Lib/fontTools/varLib/varStore.py +++ b/Lib/fontTools/varLib/varStore.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import otRound from fontTools.ttLib.tables import otTables as ot diff --git a/Lib/fontTools/voltLib/ast.py b/Lib/fontTools/voltLib/ast.py index 1ce47819b..067bfe442 100644 --- a/Lib/fontTools/voltLib/ast.py +++ b/Lib/fontTools/voltLib/ast.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.voltLib.error import VoltLibError diff --git a/Lib/fontTools/voltLib/error.py b/Lib/fontTools/voltLib/error.py index f9900ad39..a905de1eb 100644 --- a/Lib/fontTools/voltLib/error.py +++ b/Lib/fontTools/voltLib/error.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals class VoltLibError(Exception): diff --git a/Lib/fontTools/voltLib/lexer.py b/Lib/fontTools/voltLib/lexer.py index 53102b993..bc982a7af 100644 --- a/Lib/fontTools/voltLib/lexer.py +++ b/Lib/fontTools/voltLib/lexer.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.voltLib.error import VoltLibError class Lexer(object): diff --git a/Lib/fontTools/voltLib/parser.py b/Lib/fontTools/voltLib/parser.py index df035aa64..afdce8bc2 100644 --- a/Lib/fontTools/voltLib/parser.py +++ b/Lib/fontTools/voltLib/parser.py @@ -1,5 +1,3 @@ -from __future__ import ( - print_function, division, absolute_import, unicode_literals) from collections import OrderedDict import fontTools.voltLib.ast as ast from fontTools.voltLib.lexer import Lexer diff --git a/MetaTools/buildTableList.py b/MetaTools/buildTableList.py index eb9fb8580..9ee164e1e 100755 --- a/MetaTools/buildTableList.py +++ b/MetaTools/buildTableList.py @@ -33,7 +33,6 @@ tables.sort() with open(os.path.join(tablesDir, "__init__.py"), "w") as file: file.write(''' -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * # DON'T EDIT! This file is generated by MetaTools/buildTableList.py. diff --git a/MetaTools/buildUCD.py b/MetaTools/buildUCD.py index 12bd58f12..798ab44e7 100755 --- a/MetaTools/buildUCD.py +++ b/MetaTools/buildUCD.py @@ -3,8 +3,6 @@ Tools to parse data files from the Unicode Character Database. """ -from __future__ import print_function, absolute_import, division -from __future__ import unicode_literals try: from urllib.request import urlopen diff --git a/Snippets/cmap-format.py b/Snippets/cmap-format.py index 0cee39c5b..16bd6a323 100755 --- a/Snippets/cmap-format.py +++ b/Snippets/cmap-format.py @@ -10,7 +10,6 @@ # getEncoding() of subtable and use that encoding to map the # characters to Unicode... TODO: Extend this script to do that. -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont from fontTools.ttLib.tables._c_m_a_p import CmapSubtable diff --git a/Snippets/dump_woff_metadata.py b/Snippets/dump_woff_metadata.py index 0023a1067..c9ea574fc 100644 --- a/Snippets/dump_woff_metadata.py +++ b/Snippets/dump_woff_metadata.py @@ -1,4 +1,3 @@ -from __future__ import print_function import sys from fontTools.ttx import makeOutputFileName from fontTools.ttLib import TTFont diff --git a/Snippets/interpolate.py b/Snippets/interpolate.py index 7ed822d24..5802d049d 100755 --- a/Snippets/interpolate.py +++ b/Snippets/interpolate.py @@ -21,7 +21,6 @@ # $ ./interpolate.py && open Roboto.ttf -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont from fontTools.ttLib.tables._n_a_m_e import NameRecord diff --git a/Snippets/layout-features.py b/Snippets/layout-features.py index 25522cda0..fb90882b2 100755 --- a/Snippets/layout-features.py +++ b/Snippets/layout-features.py @@ -1,6 +1,5 @@ #! /usr/bin/env python -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont from fontTools.ttLib.tables import otTables diff --git a/Snippets/merge_woff_metadata.py b/Snippets/merge_woff_metadata.py index 669de461a..d6e858f23 100644 --- a/Snippets/merge_woff_metadata.py +++ b/Snippets/merge_woff_metadata.py @@ -1,4 +1,3 @@ -from __future__ import print_function import sys import os from fontTools.ttx import makeOutputFileName diff --git a/Snippets/otf2ttf.py b/Snippets/otf2ttf.py index 62b4f7359..ec8dada57 100755 --- a/Snippets/otf2ttf.py +++ b/Snippets/otf2ttf.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import print_function, division, absolute_import import argparse import logging diff --git a/Snippets/rename-fonts.py b/Snippets/rename-fonts.py index ddfce103f..cf87c8d0d 100755 --- a/Snippets/rename-fonts.py +++ b/Snippets/rename-fonts.py @@ -6,7 +6,6 @@ The current family name substring is searched in the nameIDs 1, 3, 4, 6, 16, and 21, and if found the suffix is inserted after it; or else the suffix is appended at the end. """ -from __future__ import print_function, absolute_import, unicode_literals import os import argparse import logging diff --git a/Snippets/subset-fpgm.py b/Snippets/subset-fpgm.py index c20c05fca..6ba92945b 100755 --- a/Snippets/subset-fpgm.py +++ b/Snippets/subset-fpgm.py @@ -1,6 +1,5 @@ #! /usr/bin/env python -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont import sys diff --git a/Snippets/svg2glif.py b/Snippets/svg2glif.py index aed310059..d50149c16 100755 --- a/Snippets/svg2glif.py +++ b/Snippets/svg2glif.py @@ -1,7 +1,6 @@ #!/usr/bin/env python """ Convert SVG paths to UFO glyphs. """ -from __future__ import print_function, absolute_import __requires__ = ["FontTools", "ufoLib"] diff --git a/Tests/afmLib/afmLib_test.py b/Tests/afmLib/afmLib_test.py index 97fcf8d9c..498679058 100644 --- a/Tests/afmLib/afmLib_test.py +++ b/Tests/afmLib/afmLib_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import unittest import os diff --git a/Tests/agl_test.py b/Tests/agl_test.py index 8754e6a2d..be77f270f 100644 --- a/Tests/agl_test.py +++ b/Tests/agl_test.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (print_function, division, absolute_import, - unicode_literals) from fontTools.misc.py23 import * from fontTools import agl import unittest diff --git a/Tests/cffLib/cffLib_test.py b/Tests/cffLib/cffLib_test.py index cc9d33654..339458dc9 100644 --- a/Tests/cffLib/cffLib_test.py +++ b/Tests/cffLib/cffLib_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.cffLib import TopDict, PrivateDict, CharStrings from fontTools.misc.testTools import parseXML, DataFilesHandler from fontTools.ttLib import TTFont diff --git a/Tests/cffLib/specializer_test.py b/Tests/cffLib/specializer_test.py index d45782ecb..a9b778c06 100644 --- a/Tests/cffLib/specializer_test.py +++ b/Tests/cffLib/specializer_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.cffLib.specializer import (programToString, stringToProgram, generalizeProgram, specializeProgram, programToCommands, commandsToProgram, diff --git a/Tests/designspaceLib/designspace_test.py b/Tests/designspaceLib/designspace_test.py index 608ffb1c4..7f0756bef 100644 --- a/Tests/designspaceLib/designspace_test.py +++ b/Tests/designspaceLib/designspace_test.py @@ -1,8 +1,5 @@ # coding=utf-8 -from __future__ import (print_function, division, absolute_import, - unicode_literals) - import os import sys import pytest diff --git a/Tests/encodings/codecs_test.py b/Tests/encodings/codecs_test.py index 29e3a0db8..ec8f92cd6 100644 --- a/Tests/encodings/codecs_test.py +++ b/Tests/encodings/codecs_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * import unittest import fontTools.encodings.codecs # Not to be confused with "import codecs" diff --git a/Tests/feaLib/ast_test.py b/Tests/feaLib/ast_test.py index 54bd5b3e2..3e39157b1 100644 --- a/Tests/feaLib/ast_test.py +++ b/Tests/feaLib/ast_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.feaLib import ast import unittest diff --git a/Tests/feaLib/builder_test.py b/Tests/feaLib/builder_test.py index 3d852afd9..203dd454f 100644 --- a/Tests/feaLib/builder_test.py +++ b/Tests/feaLib/builder_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.misc.loggingTools import CapturingLogHandler from fontTools.feaLib.builder import Builder, addOpenTypeFeatures, \ diff --git a/Tests/feaLib/error_test.py b/Tests/feaLib/error_test.py index 87cbecb2a..24a0e5b80 100644 --- a/Tests/feaLib/error_test.py +++ b/Tests/feaLib/error_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.feaLib.error import FeatureLibError import unittest diff --git a/Tests/feaLib/lexer_test.py b/Tests/feaLib/lexer_test.py index 1b28fa097..0c5416dd3 100644 --- a/Tests/feaLib/lexer_test.py +++ b/Tests/feaLib/lexer_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.feaLib.error import FeatureLibError, IncludedFeaNotFound from fontTools.feaLib.lexer import IncludingLexer, Lexer diff --git a/Tests/feaLib/parser_test.py b/Tests/feaLib/parser_test.py index 9343495a0..713bec550 100644 --- a/Tests/feaLib/parser_test.py +++ b/Tests/feaLib/parser_test.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.feaLib.error import FeatureLibError from fontTools.feaLib.parser import Parser, SymbolTable from fontTools.misc.py23 import * diff --git a/Tests/fontBuilder/fontBuilder_test.py b/Tests/fontBuilder/fontBuilder_test.py index 309528468..e13f11616 100644 --- a/Tests/fontBuilder/fontBuilder_test.py +++ b/Tests/fontBuilder/fontBuilder_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals import os import pytest diff --git a/Tests/misc/arrayTools_test.py b/Tests/misc/arrayTools_test.py index 2610c0fcc..127f153c8 100644 --- a/Tests/misc/arrayTools_test.py +++ b/Tests/misc/arrayTools_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.py23 import round3 from fontTools.misc.arrayTools import ( diff --git a/Tests/misc/bezierTools_test.py b/Tests/misc/bezierTools_test.py index 1519543f2..9096f2781 100644 --- a/Tests/misc/bezierTools_test.py +++ b/Tests/misc/bezierTools_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.bezierTools import ( calcQuadraticBounds, calcCubicBounds, splitLine, splitQuadratic, diff --git a/Tests/misc/classifyTools_test.py b/Tests/misc/classifyTools_test.py index ac1f65659..071baec66 100644 --- a/Tests/misc/classifyTools_test.py +++ b/Tests/misc/classifyTools_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.classifyTools import classify diff --git a/Tests/misc/eexec_test.py b/Tests/misc/eexec_test.py index 204309589..4c508dd7b 100644 --- a/Tests/misc/eexec_test.py +++ b/Tests/misc/eexec_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.eexec import decrypt, encrypt diff --git a/Tests/misc/encodingTools_test.py b/Tests/misc/encodingTools_test.py index 4c9628b7b..49961d843 100644 --- a/Tests/misc/encodingTools_test.py +++ b/Tests/misc/encodingTools_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * import unittest from fontTools.misc.encodingTools import getEncoding diff --git a/Tests/misc/etree_test.py b/Tests/misc/etree_test.py index d2f585cf5..3f3232e86 100644 --- a/Tests/misc/etree_test.py +++ b/Tests/misc/etree_test.py @@ -1,5 +1,4 @@ # coding: utf-8 -from __future__ import absolute_import, unicode_literals from fontTools.misc import etree from collections import OrderedDict import io diff --git a/Tests/misc/filenames_test.py b/Tests/misc/filenames_test.py index 47d137f6e..bb7b63c29 100644 --- a/Tests/misc/filenames_test.py +++ b/Tests/misc/filenames_test.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import unittest from fontTools.misc.filenames import ( userNameToFileName, handleClash1, handleClash2) diff --git a/Tests/misc/fixedTools_test.py b/Tests/misc/fixedTools_test.py index 5ef17776e..d7b0a93c6 100644 --- a/Tests/misc/fixedTools_test.py +++ b/Tests/misc/fixedTools_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import fixedToFloat, floatToFixed import unittest diff --git a/Tests/misc/loggingTools_test.py b/Tests/misc/loggingTools_test.py index fd64b8b3a..c726d5eea 100644 --- a/Tests/misc/loggingTools_test.py +++ b/Tests/misc/loggingTools_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.loggingTools import ( LevelFormatter, diff --git a/Tests/misc/macRes_test.py b/Tests/misc/macRes_test.py index fde13f87f..2c0fd6a4e 100644 --- a/Tests/misc/macRes_test.py +++ b/Tests/misc/macRes_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import sys import os diff --git a/Tests/misc/plistlib_test.py b/Tests/misc/plistlib_test.py index c86652983..aa2a24e25 100644 --- a/Tests/misc/plistlib_test.py +++ b/Tests/misc/plistlib_test.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, unicode_literals import sys import os import datetime diff --git a/Tests/misc/psCharStrings_test.py b/Tests/misc/psCharStrings_test.py index f69f74810..2d85bea96 100644 --- a/Tests/misc/psCharStrings_test.py +++ b/Tests/misc/psCharStrings_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.cffLib import PrivateDict from fontTools.cffLib.specializer import stringToProgram from fontTools.misc.psCharStrings import T2CharString, encodeFloat, read_realNumber diff --git a/Tests/misc/py23_test.py b/Tests/misc/py23_test.py index 22b8044e4..1a21d5a77 100644 --- a/Tests/misc/py23_test.py +++ b/Tests/misc/py23_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import deHexStr import filecmp diff --git a/Tests/misc/testTools_test.py b/Tests/misc/testTools_test.py index 11c04b1e2..82e73a1b5 100644 --- a/Tests/misc/testTools_test.py +++ b/Tests/misc/testTools_test.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * import fontTools.misc.testTools as testTools import unittest diff --git a/Tests/misc/textTools_test.py b/Tests/misc/textTools_test.py index 547569afc..44c7cc33d 100644 --- a/Tests/misc/textTools_test.py +++ b/Tests/misc/textTools_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import pad diff --git a/Tests/misc/timeTools_test.py b/Tests/misc/timeTools_test.py index 6c98f6409..e3ad3f6d2 100644 --- a/Tests/misc/timeTools_test.py +++ b/Tests/misc/timeTools_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.timeTools import asctime, timestampNow, epoch_diff import os diff --git a/Tests/misc/transform_test.py b/Tests/misc/transform_test.py index 7a7a67dca..d679e28a1 100644 --- a/Tests/misc/transform_test.py +++ b/Tests/misc/transform_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.transform import Transform, Identity, Offset, Scale import math diff --git a/Tests/misc/xmlReader_test.py b/Tests/misc/xmlReader_test.py index 33fddcc11..afa18218f 100644 --- a/Tests/misc/xmlReader_test.py +++ b/Tests/misc/xmlReader_test.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * import os import unittest diff --git a/Tests/misc/xmlWriter_test.py b/Tests/misc/xmlWriter_test.py index ac8a789e9..fd0ba89a2 100644 --- a/Tests/misc/xmlWriter_test.py +++ b/Tests/misc/xmlWriter_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import os import unittest diff --git a/Tests/mtiLib/mti_test.py b/Tests/mtiLib/mti_test.py index 491682868..1666dd45c 100644 --- a/Tests/mtiLib/mti_test.py +++ b/Tests/mtiLib/mti_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.misc.xmlWriter import XMLWriter from fontTools.ttLib import TTFont diff --git a/Tests/otlLib/builder_test.py b/Tests/otlLib/builder_test.py index 83f7c8286..3acf1c909 100644 --- a/Tests/otlLib/builder_test.py +++ b/Tests/otlLib/builder_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.testTools import getXML from fontTools.otlLib import builder from fontTools.ttLib.tables import otTables diff --git a/Tests/otlLib/maxContextCalc_test.py b/Tests/otlLib/maxContextCalc_test.py index 759b30dd8..dc169c609 100644 --- a/Tests/otlLib/maxContextCalc_test.py +++ b/Tests/otlLib/maxContextCalc_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals import os import pytest diff --git a/Tests/pens/areaPen_test.py b/Tests/pens/areaPen_test.py index ae915df52..f99e9fc73 100644 --- a/Tests/pens/areaPen_test.py +++ b/Tests/pens/areaPen_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.areaPen import AreaPen import unittest diff --git a/Tests/pens/basePen_test.py b/Tests/pens/basePen_test.py index 2a7e43c51..05ef4c625 100644 --- a/Tests/pens/basePen_test.py +++ b/Tests/pens/basePen_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.basePen import \ BasePen, decomposeSuperBezierSegment, decomposeQuadraticSegment diff --git a/Tests/pens/boundsPen_test.py b/Tests/pens/boundsPen_test.py index 533c57502..1d4b45e46 100644 --- a/Tests/pens/boundsPen_test.py +++ b/Tests/pens/boundsPen_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.boundsPen import BoundsPen, ControlBoundsPen import unittest diff --git a/Tests/pens/perimeterPen_test.py b/Tests/pens/perimeterPen_test.py index aa73c3dd6..9feff18c6 100644 --- a/Tests/pens/perimeterPen_test.py +++ b/Tests/pens/perimeterPen_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.perimeterPen import PerimeterPen import unittest diff --git a/Tests/pens/pointInsidePen_test.py b/Tests/pens/pointInsidePen_test.py index 3696ece3c..4f27210f7 100644 --- a/Tests/pens/pointInsidePen_test.py +++ b/Tests/pens/pointInsidePen_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.pointInsidePen import PointInsidePen import unittest diff --git a/Tests/pens/pointPen_test.py b/Tests/pens/pointPen_test.py index 9c71c5e2d..63658d3d0 100644 --- a/Tests/pens/pointPen_test.py +++ b/Tests/pens/pointPen_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.loggingTools import CapturingLogHandler import unittest diff --git a/Tests/pens/recordingPen_test.py b/Tests/pens/recordingPen_test.py index fdc5d06ad..971536d7a 100644 --- a/Tests/pens/recordingPen_test.py +++ b/Tests/pens/recordingPen_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.recordingPen import RecordingPen, DecomposingRecordingPen import pytest diff --git a/Tests/pens/t2CharStringPen_test.py b/Tests/pens/t2CharStringPen_test.py index c09d8108d..5de700ae7 100644 --- a/Tests/pens/t2CharStringPen_test.py +++ b/Tests/pens/t2CharStringPen_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.pens.t2CharStringPen import T2CharStringPen import unittest diff --git a/Tests/pens/ttGlyphPen_test.py b/Tests/pens/ttGlyphPen_test.py index ede240adf..ec9458903 100644 --- a/Tests/pens/ttGlyphPen_test.py +++ b/Tests/pens/ttGlyphPen_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import os diff --git a/Tests/subset/subset_test.py b/Tests/subset/subset_test.py index 9495f3264..42d302151 100644 --- a/Tests/subset/subset_test.py +++ b/Tests/subset/subset_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import subset from fontTools.ttLib import TTFont, newTable diff --git a/Tests/svgLib/path/parser_test.py b/Tests/svgLib/path/parser_test.py index eada14e70..3b130bea3 100644 --- a/Tests/svgLib/path/parser_test.py +++ b/Tests/svgLib/path/parser_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, absolute_import, division from fontTools.misc.py23 import * from fontTools.pens.recordingPen import RecordingPen diff --git a/Tests/svgLib/path/path_test.py b/Tests/svgLib/path/path_test.py index 09b944793..e99df502f 100644 --- a/Tests/svgLib/path/path_test.py +++ b/Tests/svgLib/path/path_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, absolute_import, division from fontTools.misc.py23 import * from fontTools.pens.recordingPen import RecordingPen diff --git a/Tests/svgLib/path/shapes_test.py b/Tests/svgLib/path/shapes_test.py index 99c70fdbe..9cf8fad3e 100644 --- a/Tests/svgLib/path/shapes_test.py +++ b/Tests/svgLib/path/shapes_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, absolute_import, division from fontTools.misc.py23 import * from fontTools.svgLib.path import shapes diff --git a/Tests/t1Lib/t1Lib_test.py b/Tests/t1Lib/t1Lib_test.py index 153254d6e..ba012253c 100644 --- a/Tests/t1Lib/t1Lib_test.py +++ b/Tests/t1Lib/t1Lib_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * import unittest import os diff --git a/Tests/ttLib/sfnt_test.py b/Tests/ttLib/sfnt_test.py index 2119351d1..917348332 100644 --- a/Tests/ttLib/sfnt_test.py +++ b/Tests/ttLib/sfnt_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib.sfnt import calcChecksum diff --git a/Tests/ttLib/tables/C_F_F__2_test.py b/Tests/ttLib/tables/C_F_F__2_test.py index 191f60bc4..2f0535c2b 100644 --- a/Tests/ttLib/tables/C_F_F__2_test.py +++ b/Tests/ttLib/tables/C_F_F__2_test.py @@ -1,7 +1,5 @@ """cff2Lib_test.py -- unit test for Adobe CFF fonts.""" -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.ttLib import TTFont, newTable import re diff --git a/Tests/ttLib/tables/C_F_F_test.py b/Tests/ttLib/tables/C_F_F_test.py index 63f767cc0..bbdbf4c35 100644 --- a/Tests/ttLib/tables/C_F_F_test.py +++ b/Tests/ttLib/tables/C_F_F_test.py @@ -1,7 +1,5 @@ """cffLib_test.py -- unit test for Adobe CFF fonts.""" -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.ttLib import TTFont, newTable import re diff --git a/Tests/ttLib/tables/C_P_A_L_test.py b/Tests/ttLib/tables/C_P_A_L_test.py index bacd4a87f..68009874c 100644 --- a/Tests/ttLib/tables/C_P_A_L_test.py +++ b/Tests/ttLib/tables/C_P_A_L_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.testTools import getXML, parseXML from fontTools.misc.textTools import deHexStr diff --git a/Tests/ttLib/tables/M_V_A_R_test.py b/Tests/ttLib/tables/M_V_A_R_test.py index 05a92e848..356fc1413 100644 --- a/Tests/ttLib/tables/M_V_A_R_test.py +++ b/Tests/ttLib/tables/M_V_A_R_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/O_S_2f_2_test.py b/Tests/ttLib/tables/O_S_2f_2_test.py index 116e82ea8..1f1230909 100644 --- a/Tests/ttLib/tables/O_S_2f_2_test.py +++ b/Tests/ttLib/tables/O_S_2f_2_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.ttLib import TTFont, newTable, getTableModule from fontTools.ttLib.tables.O_S_2f_2 import * import unittest diff --git a/Tests/ttLib/tables/S_T_A_T_test.py b/Tests/ttLib/tables/S_T_A_T_test.py index e851f98ff..d8c1b7dca 100644 --- a/Tests/ttLib/tables/S_T_A_T_test.py +++ b/Tests/ttLib/tables/S_T_A_T_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr diff --git a/Tests/ttLib/tables/T_S_I__0_test.py b/Tests/ttLib/tables/T_S_I__0_test.py index 1de6b3412..3e30d8589 100644 --- a/Tests/ttLib/tables/T_S_I__0_test.py +++ b/Tests/ttLib/tables/T_S_I__0_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import SimpleNamespace from fontTools.misc.textTools import deHexStr from fontTools.misc.testTools import getXML diff --git a/Tests/ttLib/tables/T_S_I__1_test.py b/Tests/ttLib/tables/T_S_I__1_test.py index e529425a4..9f0c949a4 100644 --- a/Tests/ttLib/tables/T_S_I__1_test.py +++ b/Tests/ttLib/tables/T_S_I__1_test.py @@ -1,6 +1,3 @@ -from __future__ import ( - print_function, division, absolute_import, unicode_literals -) from fontTools.misc.py23 import unichr, tobytes from fontTools.misc.loggingTools import CapturingLogHandler from fontTools.ttLib import TTFont, TTLibError diff --git a/Tests/ttLib/tables/TupleVariation_test.py b/Tests/ttLib/tables/TupleVariation_test.py index d78810a9c..c35c23d0f 100644 --- a/Tests/ttLib/tables/TupleVariation_test.py +++ b/Tests/ttLib/tables/TupleVariation_test.py @@ -1,5 +1,3 @@ -from __future__ import \ - print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.loggingTools import CapturingLogHandler from fontTools.misc.testTools import parseXML diff --git a/Tests/ttLib/tables/_a_n_k_r_test.py b/Tests/ttLib/tables/_a_n_k_r_test.py index 0327e46bc..1679cc09d 100644 --- a/Tests/ttLib/tables/_a_n_k_r_test.py +++ b/Tests/ttLib/tables/_a_n_k_r_test.py @@ -1,5 +1,4 @@ # coding: utf-8 -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/_a_v_a_r_test.py b/Tests/ttLib/tables/_a_v_a_r_test.py index 7b921188c..3710dcc3d 100644 --- a/Tests/ttLib/tables/_a_v_a_r_test.py +++ b/Tests/ttLib/tables/_a_v_a_r_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import parseXML from fontTools.misc.textTools import deHexStr diff --git a/Tests/ttLib/tables/_b_s_l_n_test.py b/Tests/ttLib/tables/_b_s_l_n_test.py index 97ffa6a85..9fd9d3863 100644 --- a/Tests/ttLib/tables/_b_s_l_n_test.py +++ b/Tests/ttLib/tables/_b_s_l_n_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/_c_i_d_g_test.py b/Tests/ttLib/tables/_c_i_d_g_test.py index c6e8d3cf7..64146330b 100644 --- a/Tests/ttLib/tables/_c_i_d_g_test.py +++ b/Tests/ttLib/tables/_c_i_d_g_test.py @@ -1,5 +1,4 @@ # coding: utf-8 -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/_c_m_a_p_test.py b/Tests/ttLib/tables/_c_m_a_p_test.py index 233cd14fe..2ea6e7042 100644 --- a/Tests/ttLib/tables/_c_m_a_p_test.py +++ b/Tests/ttLib/tables/_c_m_a_p_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals import io import os import re diff --git a/Tests/ttLib/tables/_c_v_a_r_test.py b/Tests/ttLib/tables/_c_v_a_r_test.py index 0fd553138..d51c7d6eb 100644 --- a/Tests/ttLib/tables/_c_v_a_r_test.py +++ b/Tests/ttLib/tables/_c_v_a_r_test.py @@ -1,5 +1,3 @@ -from __future__ import \ - print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/_f_p_g_m_test.py b/Tests/ttLib/tables/_f_p_g_m_test.py index 71fec4816..0a34121c7 100644 --- a/Tests/ttLib/tables/_f_p_g_m_test.py +++ b/Tests/ttLib/tables/_f_p_g_m_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.ttLib.tables._f_p_g_m import table__f_p_g_m from fontTools.ttLib.tables import ttProgram diff --git a/Tests/ttLib/tables/_f_v_a_r_test.py b/Tests/ttLib/tables/_f_v_a_r_test.py index 4a8e76718..1c025f468 100644 --- a/Tests/ttLib/tables/_f_v_a_r_test.py +++ b/Tests/ttLib/tables/_f_v_a_r_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import parseXML from fontTools.misc.textTools import deHexStr diff --git a/Tests/ttLib/tables/_g_c_i_d_test.py b/Tests/ttLib/tables/_g_c_i_d_test.py index 1ec92fb36..5093b7851 100644 --- a/Tests/ttLib/tables/_g_c_i_d_test.py +++ b/Tests/ttLib/tables/_g_c_i_d_test.py @@ -1,5 +1,4 @@ # coding: utf-8 -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/_g_l_y_f_test.py b/Tests/ttLib/tables/_g_l_y_f_test.py index b30528aae..db014b4a3 100644 --- a/Tests/ttLib/tables/_g_l_y_f_test.py +++ b/Tests/ttLib/tables/_g_l_y_f_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.fixedTools import otRound from fontTools.pens.ttGlyphPen import TTGlyphPen diff --git a/Tests/ttLib/tables/_g_v_a_r_test.py b/Tests/ttLib/tables/_g_v_a_r_test.py index ebae5806e..15ef76114 100644 --- a/Tests/ttLib/tables/_g_v_a_r_test.py +++ b/Tests/ttLib/tables/_g_v_a_r_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/_h_h_e_a_test.py b/Tests/ttLib/tables/_h_h_e_a_test.py index 64849e9d7..eb457dee2 100644 --- a/Tests/ttLib/tables/_h_h_e_a_test.py +++ b/Tests/ttLib/tables/_h_h_e_a_test.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.loggingTools import CapturingLogHandler from fontTools.misc.testTools import parseXML, getXML diff --git a/Tests/ttLib/tables/_h_m_t_x_test.py b/Tests/ttLib/tables/_h_m_t_x_test.py index 5c79fb88f..b21cda649 100644 --- a/Tests/ttLib/tables/_h_m_t_x_test.py +++ b/Tests/ttLib/tables/_h_m_t_x_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import parseXML, getXML from fontTools.misc.textTools import deHexStr diff --git a/Tests/ttLib/tables/_k_e_r_n_test.py b/Tests/ttLib/tables/_k_e_r_n_test.py index b37748ad3..483086c4a 100644 --- a/Tests/ttLib/tables/_k_e_r_n_test.py +++ b/Tests/ttLib/tables/_k_e_r_n_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import newTable from fontTools.ttLib.tables._k_e_r_n import ( diff --git a/Tests/ttLib/tables/_l_c_a_r_test.py b/Tests/ttLib/tables/_l_c_a_r_test.py index 4525def7a..288092f01 100644 --- a/Tests/ttLib/tables/_l_c_a_r_test.py +++ b/Tests/ttLib/tables/_l_c_a_r_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/_l_t_a_g_test.py b/Tests/ttLib/tables/_l_t_a_g_test.py index a4c5a0ea1..67279364e 100644 --- a/Tests/ttLib/tables/_l_t_a_g_test.py +++ b/Tests/ttLib/tables/_l_t_a_g_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.testTools import parseXML from fontTools.misc.xmlWriter import XMLWriter diff --git a/Tests/ttLib/tables/_m_e_t_a_test.py b/Tests/ttLib/tables/_m_e_t_a_test.py index dc0f8cd0f..4f0a41589 100644 --- a/Tests/ttLib/tables/_m_e_t_a_test.py +++ b/Tests/ttLib/tables/_m_e_t_a_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import parseXML from fontTools.misc.textTools import deHexStr diff --git a/Tests/ttLib/tables/_m_o_r_t_test.py b/Tests/ttLib/tables/_m_o_r_t_test.py index 70696e829..c89a19b3d 100644 --- a/Tests/ttLib/tables/_m_o_r_t_test.py +++ b/Tests/ttLib/tables/_m_o_r_t_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/_m_o_r_x_test.py b/Tests/ttLib/tables/_m_o_r_x_test.py index f4e7fb89a..0730d2349 100644 --- a/Tests/ttLib/tables/_m_o_r_x_test.py +++ b/Tests/ttLib/tables/_m_o_r_x_test.py @@ -1,5 +1,4 @@ # coding: utf-8 -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/_n_a_m_e_test.py b/Tests/ttLib/tables/_n_a_m_e_test.py index 136b63f3d..6ffed87b4 100644 --- a/Tests/ttLib/tables/_n_a_m_e_test.py +++ b/Tests/ttLib/tables/_n_a_m_e_test.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc import sstruct from fontTools.misc.loggingTools import CapturingLogHandler diff --git a/Tests/ttLib/tables/_o_p_b_d_test.py b/Tests/ttLib/tables/_o_p_b_d_test.py index 131d3f9dc..3d5f90fa7 100644 --- a/Tests/ttLib/tables/_o_p_b_d_test.py +++ b/Tests/ttLib/tables/_o_p_b_d_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/_p_r_o_p_test.py b/Tests/ttLib/tables/_p_r_o_p_test.py index edac91555..b293fa654 100644 --- a/Tests/ttLib/tables/_p_r_o_p_test.py +++ b/Tests/ttLib/tables/_p_r_o_p_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import FakeFont, getXML, parseXML from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/_t_r_a_k_test.py b/Tests/ttLib/tables/_t_r_a_k_test.py index c223c8158..d37b54879 100644 --- a/Tests/ttLib/tables/_t_r_a_k_test.py +++ b/Tests/ttLib/tables/_t_r_a_k_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import parseXML, getXML from fontTools.misc.textTools import deHexStr diff --git a/Tests/ttLib/tables/_v_h_e_a_test.py b/Tests/ttLib/tables/_v_h_e_a_test.py index 8979e928f..61445e5cc 100644 --- a/Tests/ttLib/tables/_v_h_e_a_test.py +++ b/Tests/ttLib/tables/_v_h_e_a_test.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.loggingTools import CapturingLogHandler from fontTools.misc.testTools import parseXML, getXML diff --git a/Tests/ttLib/tables/_v_m_t_x_test.py b/Tests/ttLib/tables/_v_m_t_x_test.py index f55dbeca9..286651cf5 100644 --- a/Tests/ttLib/tables/_v_m_t_x_test.py +++ b/Tests/ttLib/tables/_v_m_t_x_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.ttLib.tables._v_m_t_x import table__v_m_t_x import _h_m_t_x_test diff --git a/Tests/ttLib/tables/otBase_test.py b/Tests/ttLib/tables/otBase_test.py index f1fa5b0dc..4351d03bc 100644 --- a/Tests/ttLib/tables/otBase_test.py +++ b/Tests/ttLib/tables/otBase_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.textTools import deHexStr from fontTools.ttLib.tables.otBase import OTTableReader, OTTableWriter diff --git a/Tests/ttLib/tables/otConverters_test.py b/Tests/ttLib/tables/otConverters_test.py index 3b9d5e9fc..dd90031b1 100644 --- a/Tests/ttLib/tables/otConverters_test.py +++ b/Tests/ttLib/tables/otConverters_test.py @@ -1,6 +1,4 @@ # coding: utf-8 -from __future__ import print_function, division, absolute_import, \ - unicode_literals from fontTools.misc.py23 import * from fontTools.misc.loggingTools import CapturingLogHandler from fontTools.misc.testTools import FakeFont, makeXMLWriter diff --git a/Tests/ttLib/tables/otTables_test.py b/Tests/ttLib/tables/otTables_test.py index f39e27c2e..df811ad93 100644 --- a/Tests/ttLib/tables/otTables_test.py +++ b/Tests/ttLib/tables/otTables_test.py @@ -1,5 +1,4 @@ # coding: utf-8 -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools.misc.testTools import getXML, parseXML, FakeFont from fontTools.misc.textTools import deHexStr, hexStr diff --git a/Tests/ttLib/tables/tables_test.py b/Tests/ttLib/tables/tables_test.py index 9d03814e1..b031b48f4 100644 --- a/Tests/ttLib/tables/tables_test.py +++ b/Tests/ttLib/tables/tables_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.ttLib import TTFont, tagToXML import os diff --git a/Tests/ttLib/tables/ttProgram_test.py b/Tests/ttLib/tables/ttProgram_test.py index 9a7d232c2..0bc14ab29 100644 --- a/Tests/ttLib/tables/ttProgram_test.py +++ b/Tests/ttLib/tables/ttProgram_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.xmlWriter import XMLWriter from fontTools.ttLib.tables.ttProgram import Program diff --git a/Tests/ttLib/woff2_test.py b/Tests/ttLib/woff2_test.py index 4a474aed7..10439bc5a 100644 --- a/Tests/ttLib/woff2_test.py +++ b/Tests/ttLib/woff2_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import, unicode_literals from fontTools.misc.py23 import * from fontTools import ttLib from fontTools.ttLib import woff2 diff --git a/Tests/ttx/ttx_test.py b/Tests/ttx/ttx_test.py index 97307fb7a..753cc9ce2 100644 --- a/Tests/ttx/ttx_test.py +++ b/Tests/ttx/ttx_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.misc.testTools import parseXML from fontTools.misc.timeTools import timestampSinceEpoch diff --git a/Tests/ufoLib/GLIF1_test.py b/Tests/ufoLib/GLIF1_test.py index 707c2097b..d5db05cff 100644 --- a/Tests/ufoLib/GLIF1_test.py +++ b/Tests/ufoLib/GLIF1_test.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals import unittest from fontTools.ufoLib.glifLib import GlifLibError, readGlyphFromString, writeGlyphToString from .testSupport import Glyph, stripText diff --git a/Tests/ufoLib/GLIF2_test.py b/Tests/ufoLib/GLIF2_test.py index 2daa45335..a20178557 100644 --- a/Tests/ufoLib/GLIF2_test.py +++ b/Tests/ufoLib/GLIF2_test.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals import unittest from fontTools.ufoLib.glifLib import GlifLibError, readGlyphFromString, writeGlyphToString from .testSupport import Glyph, stripText diff --git a/Tests/ufoLib/UFO1_test.py b/Tests/ufoLib/UFO1_test.py index 6194270db..e1b4be485 100644 --- a/Tests/ufoLib/UFO1_test.py +++ b/Tests/ufoLib/UFO1_test.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals import os import shutil import unittest diff --git a/Tests/ufoLib/UFO2_test.py b/Tests/ufoLib/UFO2_test.py index 04309ba7e..5171da6f4 100644 --- a/Tests/ufoLib/UFO2_test.py +++ b/Tests/ufoLib/UFO2_test.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals import os import shutil import unittest diff --git a/Tests/ufoLib/UFO3_test.py b/Tests/ufoLib/UFO3_test.py index 3cfd7c8f8..1cc8c00d4 100644 --- a/Tests/ufoLib/UFO3_test.py +++ b/Tests/ufoLib/UFO3_test.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals import os import shutil import unittest diff --git a/Tests/ufoLib/UFOConversion_test.py b/Tests/ufoLib/UFOConversion_test.py index 2e288b94d..2027efbb8 100644 --- a/Tests/ufoLib/UFOConversion_test.py +++ b/Tests/ufoLib/UFOConversion_test.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals import os import shutil import unittest diff --git a/Tests/ufoLib/UFOZ_test.py b/Tests/ufoLib/UFOZ_test.py index b32bba386..a962e14b5 100644 --- a/Tests/ufoLib/UFOZ_test.py +++ b/Tests/ufoLib/UFOZ_test.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals from fontTools.misc.py23 import tostr from fontTools.ufoLib import UFOReader, UFOWriter, UFOFileStructure from fontTools.ufoLib.errors import UFOLibError, GlifLibError diff --git a/Tests/ufoLib/filenames_test.py b/Tests/ufoLib/filenames_test.py index a1d6d92a9..a9415a1c2 100644 --- a/Tests/ufoLib/filenames_test.py +++ b/Tests/ufoLib/filenames_test.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, unicode_literals import unittest from fontTools.ufoLib.filenames import userNameToFileName, handleClash1, handleClash2 diff --git a/Tests/ufoLib/glifLib_test.py b/Tests/ufoLib/glifLib_test.py index 3bcd07c1a..8bf42e0fa 100644 --- a/Tests/ufoLib/glifLib_test.py +++ b/Tests/ufoLib/glifLib_test.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, unicode_literals import os import tempfile import shutil diff --git a/Tests/ufoLib/testSupport.py b/Tests/ufoLib/testSupport.py index 2982ce84c..86611d510 100755 --- a/Tests/ufoLib/testSupport.py +++ b/Tests/ufoLib/testSupport.py @@ -1,6 +1,5 @@ """Miscellaneous helpers for our test suite.""" -from __future__ import absolute_import, unicode_literals import os from fontTools.ufoLib.utils import numberTypes diff --git a/Tests/unicodedata_test.py b/Tests/unicodedata_test.py index fde3338f1..affdd2668 100644 --- a/Tests/unicodedata_test.py +++ b/Tests/unicodedata_test.py @@ -1,5 +1,3 @@ -from __future__ import ( - print_function, division, absolute_import, unicode_literals) from fontTools.misc.py23 import * from fontTools import unicodedata diff --git a/Tests/varLib/builder_test.py b/Tests/varLib/builder_test.py index 09fd29039..80607eaad 100644 --- a/Tests/varLib/builder_test.py +++ b/Tests/varLib/builder_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.varLib.builder import buildVarData import pytest diff --git a/Tests/varLib/featureVars_test.py b/Tests/varLib/featureVars_test.py index 4db2e625e..84228868f 100644 --- a/Tests/varLib/featureVars_test.py +++ b/Tests/varLib/featureVars_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.varLib.featureVars import ( overlayFeatureVariations) diff --git a/Tests/varLib/instancer_test.py b/Tests/varLib/instancer_test.py index 7c587b595..034019197 100644 --- a/Tests/varLib/instancer_test.py +++ b/Tests/varLib/instancer_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools import ttLib from fontTools import designspaceLib diff --git a/Tests/varLib/interpolatable_test.py b/Tests/varLib/interpolatable_test.py index 4900d5229..d6bc6ce68 100644 --- a/Tests/varLib/interpolatable_test.py +++ b/Tests/varLib/interpolatable_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont from fontTools.varLib.interpolatable import main as interpolatable_main diff --git a/Tests/varLib/interpolate_layout_test.py b/Tests/varLib/interpolate_layout_test.py index b858a3c97..572dd3ec6 100644 --- a/Tests/varLib/interpolate_layout_test.py +++ b/Tests/varLib/interpolate_layout_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont from fontTools.varLib import build diff --git a/Tests/varLib/models_test.py b/Tests/varLib/models_test.py index ae67e0e93..56f7104a2 100644 --- a/Tests/varLib/models_test.py +++ b/Tests/varLib/models_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.varLib.models import ( normalizeLocation, supportScalar, VariationModel) diff --git a/Tests/varLib/mutator_test.py b/Tests/varLib/mutator_test.py index d781d59ed..010ab5dda 100644 --- a/Tests/varLib/mutator_test.py +++ b/Tests/varLib/mutator_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont from fontTools.varLib import build diff --git a/Tests/varLib/varLib_test.py b/Tests/varLib/varLib_test.py index ec05d5657..442b1aabe 100644 --- a/Tests/varLib/varLib_test.py +++ b/Tests/varLib/varLib_test.py @@ -1,4 +1,3 @@ -from __future__ import print_function, division, absolute_import from fontTools.misc.py23 import * from fontTools.ttLib import TTFont, newTable from fontTools.varLib import build diff --git a/Tests/voltLib/lexer_test.py b/Tests/voltLib/lexer_test.py index 6041cb85c..2145d079a 100644 --- a/Tests/voltLib/lexer_test.py +++ b/Tests/voltLib/lexer_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.voltLib.error import VoltLibError from fontTools.voltLib.lexer import Lexer import unittest diff --git a/Tests/voltLib/parser_test.py b/Tests/voltLib/parser_test.py index 3bfa17c8e..82ee49edc 100644 --- a/Tests/voltLib/parser_test.py +++ b/Tests/voltLib/parser_test.py @@ -1,5 +1,3 @@ -from __future__ import print_function, division, absolute_import -from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.voltLib import ast from fontTools.voltLib.error import VoltLibError diff --git a/fonttools b/fonttools index 92b390e77..e914367aa 100755 --- a/fonttools +++ b/fonttools @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import print_function, division, absolute_import import sys import os.path