diff --git a/Lib/fontTools/__init__.py b/Lib/fontTools/__init__.py index 72ede43af..ca39ddcaf 100644 --- a/Lib/fontTools/__init__.py +++ b/Lib/fontTools/__init__.py @@ -1 +1,4 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * + version = "2.5" diff --git a/Lib/fontTools/encodings/MacRoman.py b/Lib/fontTools/encodings/MacRoman.py index bfeb0d515..cc559302d 100644 --- a/Lib/fontTools/encodings/MacRoman.py +++ b/Lib/fontTools/encodings/MacRoman.py @@ -1,3 +1,6 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * + MacRoman = [ 'NUL', 'Eth', 'eth', 'Lslash', 'lslash', 'Scaron', 'scaron', 'Yacute', 'yacute', 'HT', 'LF', 'Thorn', 'thorn', 'CR', 'Zcaron', 'zcaron', 'DLE', 'DC1', diff --git a/Lib/fontTools/encodings/StandardEncoding.py b/Lib/fontTools/encodings/StandardEncoding.py index 810b2a092..dc01ef8ff 100644 --- a/Lib/fontTools/encodings/StandardEncoding.py +++ b/Lib/fontTools/encodings/StandardEncoding.py @@ -1,3 +1,6 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * + StandardEncoding = [ '.notdef', '.notdef', '.notdef', '.notdef', '.notdef', '.notdef', '.notdef', '.notdef', '.notdef', '.notdef', diff --git a/Lib/fontTools/encodings/__init__.py b/Lib/fontTools/encodings/__init__.py index e001bb2fc..3f9abc961 100644 --- a/Lib/fontTools/encodings/__init__.py +++ b/Lib/fontTools/encodings/__init__.py @@ -1,3 +1,4 @@ -"""Empty __init__.py file to signal Python this directory is a package. -(It can't be completely empty since WinZip seems to skip empty files.) -""" +"""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/__init__.py b/Lib/fontTools/misc/__init__.py index e001bb2fc..3f9abc961 100644 --- a/Lib/fontTools/misc/__init__.py +++ b/Lib/fontTools/misc/__init__.py @@ -1,3 +1,4 @@ -"""Empty __init__.py file to signal Python this directory is a package. -(It can't be completely empty since WinZip seems to skip empty files.) -""" +"""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/__init__.py b/Lib/fontTools/pens/__init__.py index e001bb2fc..3f9abc961 100644 --- a/Lib/fontTools/pens/__init__.py +++ b/Lib/fontTools/pens/__init__.py @@ -1,3 +1,4 @@ -"""Empty __init__.py file to signal Python this directory is a package. -(It can't be completely empty since WinZip seems to skip empty files.) -""" +"""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/ttLib/standardGlyphOrder.py b/Lib/fontTools/ttLib/standardGlyphOrder.py index fdb666a67..4b2d0cd96 100644 --- a/Lib/fontTools/ttLib/standardGlyphOrder.py +++ b/Lib/fontTools/ttLib/standardGlyphOrder.py @@ -1,3 +1,6 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * + # # 'post' table formats 1.0 and 2.0 rely on this list of "standard" # glyphs. diff --git a/Lib/fontTools/ttLib/tables/B_A_S_E_.py b/Lib/fontTools/ttLib/tables/B_A_S_E_.py index 9551e2c6d..14906b403 100644 --- a/Lib/fontTools/ttLib/tables/B_A_S_E_.py +++ b/Lib/fontTools/ttLib/tables/B_A_S_E_.py @@ -1,3 +1,5 @@ +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_B_L_C_.py b/Lib/fontTools/ttLib/tables/C_B_L_C_.py index 2f785710e..3d67dd0c2 100644 --- a/Lib/fontTools/ttLib/tables/C_B_L_C_.py +++ b/Lib/fontTools/ttLib/tables/C_B_L_C_.py @@ -2,6 +2,8 @@ # # Google Author(s): Matt Fontaine +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * from . import E_B_L_C_ class table_C_B_L_C_(E_B_L_C_.table_E_B_L_C_): diff --git a/Lib/fontTools/ttLib/tables/F_F_T_M_.py b/Lib/fontTools/ttLib/tables/F_F_T_M_.py index 20a12eca5..3d110bdb6 100644 --- a/Lib/fontTools/ttLib/tables/F_F_T_M_.py +++ b/Lib/fontTools/ttLib/tables/F_F_T_M_.py @@ -1,3 +1,4 @@ +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 d4a574148..08faf6272 100644 --- a/Lib/fontTools/ttLib/tables/G_D_E_F_.py +++ b/Lib/fontTools/ttLib/tables/G_D_E_F_.py @@ -1,3 +1,5 @@ +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_P_O_S_.py b/Lib/fontTools/ttLib/tables/G_P_O_S_.py index 013c8209b..1c36061c9 100644 --- a/Lib/fontTools/ttLib/tables/G_P_O_S_.py +++ b/Lib/fontTools/ttLib/tables/G_P_O_S_.py @@ -1,3 +1,5 @@ +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 44036490d..d23e8ba1f 100644 --- a/Lib/fontTools/ttLib/tables/G_S_U_B_.py +++ b/Lib/fontTools/ttLib/tables/G_S_U_B_.py @@ -1,3 +1,5 @@ +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 ddf54055f..dffd08b09 100644 --- a/Lib/fontTools/ttLib/tables/J_S_T_F_.py +++ b/Lib/fontTools/ttLib/tables/J_S_T_F_.py @@ -1,3 +1,5 @@ +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_A_T_H_.py b/Lib/fontTools/ttLib/tables/M_A_T_H_.py index d894c0827..8c329ba59 100644 --- a/Lib/fontTools/ttLib/tables/M_A_T_H_.py +++ b/Lib/fontTools/ttLib/tables/M_A_T_H_.py @@ -1,3 +1,5 @@ +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_B_.py b/Lib/fontTools/ttLib/tables/T_S_I_B_.py index 5cc54e27e..e0278626b 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_B_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_B_.py @@ -1,3 +1,5 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * from . import asciiTable class table_T_S_I_B_(asciiTable.asciiTable): diff --git a/Lib/fontTools/ttLib/tables/T_S_I_D_.py b/Lib/fontTools/ttLib/tables/T_S_I_D_.py index 8228f8a90..4949b96c1 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_D_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_D_.py @@ -1,3 +1,5 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * from . import asciiTable class table_T_S_I_D_(asciiTable.asciiTable): diff --git a/Lib/fontTools/ttLib/tables/T_S_I_J_.py b/Lib/fontTools/ttLib/tables/T_S_I_J_.py index 0983b57c6..a78dcffba 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_J_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_J_.py @@ -1,3 +1,5 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * from . import asciiTable class table_T_S_I_J_(asciiTable.asciiTable): diff --git a/Lib/fontTools/ttLib/tables/T_S_I_P_.py b/Lib/fontTools/ttLib/tables/T_S_I_P_.py index e34a18c99..c7e482644 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_P_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_P_.py @@ -1,3 +1,5 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * from . import asciiTable class table_T_S_I_P_(asciiTable.asciiTable): diff --git a/Lib/fontTools/ttLib/tables/T_S_I_S_.py b/Lib/fontTools/ttLib/tables/T_S_I_S_.py index 56373e664..03bb49600 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_S_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_S_.py @@ -1,3 +1,5 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * from . import asciiTable class table_T_S_I_S_(asciiTable.asciiTable): diff --git a/Lib/fontTools/ttLib/tables/T_S_I_V_.py b/Lib/fontTools/ttLib/tables/T_S_I_V_.py index a87e3f7d4..3c0f15b5e 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I_V_.py +++ b/Lib/fontTools/ttLib/tables/T_S_I_V_.py @@ -1,3 +1,5 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * from . import asciiTable class table_T_S_I_V_(asciiTable.asciiTable): diff --git a/Lib/fontTools/ttLib/tables/T_S_I__2.py b/Lib/fontTools/ttLib/tables/T_S_I__2.py index 15c02abaa..a34ed57c6 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I__2.py +++ b/Lib/fontTools/ttLib/tables/T_S_I__2.py @@ -1,3 +1,5 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * from fontTools import ttLib superclass = ttLib.getTableClass("TSI0") diff --git a/Lib/fontTools/ttLib/tables/T_S_I__3.py b/Lib/fontTools/ttLib/tables/T_S_I__3.py index eb4087cfb..ca0995a41 100644 --- a/Lib/fontTools/ttLib/tables/T_S_I__3.py +++ b/Lib/fontTools/ttLib/tables/T_S_I__3.py @@ -1,3 +1,5 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * from fontTools import ttLib superclass = ttLib.getTableClass("TSI1") diff --git a/Lib/fontTools/ttLib/tables/V_D_M_X_.py b/Lib/fontTools/ttLib/tables/V_D_M_X_.py index 04772c923..ac045874a 100644 --- a/Lib/fontTools/ttLib/tables/V_D_M_X_.py +++ b/Lib/fontTools/ttLib/tables/V_D_M_X_.py @@ -1,4 +1,6 @@ -from fontTools.ttLib.tables import DefaultTable +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * +from . import DefaultTable from fontTools.misc import sstruct from fontTools.misc.textTools import safeEval import struct diff --git a/Lib/fontTools/ttLib/tables/__init__.py b/Lib/fontTools/ttLib/tables/__init__.py index 5541abc57..53af1a9c8 100644 --- a/Lib/fontTools/ttLib/tables/__init__.py +++ b/Lib/fontTools/ttLib/tables/__init__.py @@ -1,3 +1,5 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * # DON'T EDIT! This file is generated by MetaTools/buildTableList.py. def _moduleFinderHint(): diff --git a/Lib/fontTools/ttLib/tables/_f_e_a_t.py b/Lib/fontTools/ttLib/tables/_f_e_a_t.py index eb03f8ba6..371527142 100644 --- a/Lib/fontTools/ttLib/tables/_f_e_a_t.py +++ b/Lib/fontTools/ttLib/tables/_f_e_a_t.py @@ -1,3 +1,5 @@ +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_v_a_r.py b/Lib/fontTools/ttLib/tables/_f_v_a_r.py index eec39c650..9733726a8 100644 --- a/Lib/fontTools/ttLib/tables/_f_v_a_r.py +++ b/Lib/fontTools/ttLib/tables/_f_v_a_r.py @@ -1,3 +1,5 @@ +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 623f307d8..03b647f2a 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 fontTools.misc.py23 import * from fontTools.misc import sstruct diff --git a/Lib/fontTools/ttLib/tables/_p_r_e_p.py b/Lib/fontTools/ttLib/tables/_p_r_e_p.py index fc92665dc..1cd1c030e 100644 --- a/Lib/fontTools/ttLib/tables/_p_r_e_p.py +++ b/Lib/fontTools/ttLib/tables/_p_r_e_p.py @@ -1,3 +1,5 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * from fontTools import ttLib superclass = ttLib.getTableClass("fpgm") diff --git a/Lib/fontTools/ttLib/tables/_v_m_t_x.py b/Lib/fontTools/ttLib/tables/_v_m_t_x.py index c204de64a..2ac497ded 100644 --- a/Lib/fontTools/ttLib/tables/_v_m_t_x.py +++ b/Lib/fontTools/ttLib/tables/_v_m_t_x.py @@ -1,3 +1,5 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * from fontTools import ttLib superclass = ttLib.getTableClass("hmtx") diff --git a/Lib/fontTools/ttLib/tables/otData.py b/Lib/fontTools/ttLib/tables/otData.py index c2d84b682..f47e7ee22 100644 --- a/Lib/fontTools/ttLib/tables/otData.py +++ b/Lib/fontTools/ttLib/tables/otData.py @@ -1,3 +1,6 @@ +from __future__ import print_function, division, absolute_import +from fontTools.misc.py23 import * + otData = [ # diff --git a/MetaTools/buildTableList.py b/MetaTools/buildTableList.py index 0153ec726..2285f3d3f 100755 --- a/MetaTools/buildTableList.py +++ b/MetaTools/buildTableList.py @@ -32,6 +32,9 @@ tables.sort() file = open(os.path.join(tablesDir, "__init__.py"), "w") 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. def _moduleFinderHint(): """Dummy function to let modulefinder know what tables may be