2to3 --fix=import
diff --git a/Lib/fontTools/ttLib/__init__.py b/Lib/fontTools/ttLib/__init__.py
index 52d6d1a..e04b611 100644
--- a/Lib/fontTools/ttLib/__init__.py
+++ b/Lib/fontTools/ttLib/__init__.py
@@ -148,7 +148,7 @@
# assume file is a string
if haveMacSupport and res_name_or_index is not None:
# on the mac, we deal with sfnt resources as well as flat files
- import macUtils
+ from . import macUtils
if res_name_or_index == 0:
if macUtils.getSFNTResIndices(file):
# get the first available sfnt font.
@@ -183,7 +183,7 @@
if not hasattr(file, "write"):
closeStream = 1
if os.name == "mac" and makeSuitcase:
- import macUtils
+ from . import macUtils
file = macUtils.SFNTResourceWriter(file, self)
else:
file = open(file, "wb")
@@ -391,7 +391,7 @@
raise
# fall back to DefaultTable, retaining the binary table data
print "An exception occurred during the decompilation of the '%s' table" % tag
- from tables.DefaultTable import DefaultTable
+ from .tables.DefaultTable import DefaultTable
import StringIO
file = StringIO.StringIO()
traceback.print_exc(file=file)
@@ -773,7 +773,7 @@
"""Fetch the packer/unpacker module for a table.
Return None when no module is found.
"""
- import tables
+ from . import tables
pyTag = tagToIdentifier(tag)
try:
__import__("fontTools.ttLib.tables." + pyTag)
@@ -796,7 +796,7 @@
"""
module = getTableModule(tag)
if module is None:
- from tables.DefaultTable import DefaultTable
+ from .tables.DefaultTable import DefaultTable
return DefaultTable
pyTag = tagToIdentifier(tag)
tableClass = getattr(module, "table_" + pyTag)
diff --git a/Lib/fontTools/ttLib/tables/B_A_S_E_.py b/Lib/fontTools/ttLib/tables/B_A_S_E_.py
index 53975c8..9551e2c 100644
--- a/Lib/fontTools/ttLib/tables/B_A_S_E_.py
+++ b/Lib/fontTools/ttLib/tables/B_A_S_E_.py
@@ -1,4 +1,4 @@
-from otBase import BaseTTXConverter
+from .otBase import BaseTTXConverter
class table_B_A_S_E_(BaseTTXConverter):
diff --git a/Lib/fontTools/ttLib/tables/C_B_D_T_.py b/Lib/fontTools/ttLib/tables/C_B_D_T_.py
index 2289594..cb01021 100644
--- a/Lib/fontTools/ttLib/tables/C_B_D_T_.py
+++ b/Lib/fontTools/ttLib/tables/C_B_D_T_.py
@@ -3,12 +3,12 @@
# Google Author(s): Matt Fontaine
-import E_B_D_T_
+from . import E_B_D_T_
import string
import struct
from fontTools.misc import sstruct
-from BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat
-from E_B_D_T_ import BitmapGlyph, BitmapPlusSmallMetricsMixin, BitmapPlusBigMetricsMixin
+from .BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat
+from .E_B_D_T_ import BitmapGlyph, BitmapPlusSmallMetricsMixin, BitmapPlusBigMetricsMixin
class table_C_B_D_T_(E_B_D_T_.table_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 886f50c..2f78571 100644
--- a/Lib/fontTools/ttLib/tables/C_B_L_C_.py
+++ b/Lib/fontTools/ttLib/tables/C_B_L_C_.py
@@ -2,7 +2,7 @@
#
# Google Author(s): Matt Fontaine
-import E_B_L_C_
+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/C_F_F_.py b/Lib/fontTools/ttLib/tables/C_F_F_.py
index 6a083c3..6162a87 100644
--- a/Lib/fontTools/ttLib/tables/C_F_F_.py
+++ b/Lib/fontTools/ttLib/tables/C_F_F_.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
from fontTools import cffLib
diff --git a/Lib/fontTools/ttLib/tables/C_O_L_R_.py b/Lib/fontTools/ttLib/tables/C_O_L_R_.py
index c0f3691..0664c35 100644
--- a/Lib/fontTools/ttLib/tables/C_O_L_R_.py
+++ b/Lib/fontTools/ttLib/tables/C_O_L_R_.py
@@ -3,7 +3,7 @@
# Google Author(s): Behdad Esfahbod
import operator
-import DefaultTable
+from . import DefaultTable
import struct
from fontTools.ttLib import sfnt
from fontTools.misc.textTools import safeEval, readHex
diff --git a/Lib/fontTools/ttLib/tables/C_P_A_L_.py b/Lib/fontTools/ttLib/tables/C_P_A_L_.py
index e9f6d19..f510c2e 100644
--- a/Lib/fontTools/ttLib/tables/C_P_A_L_.py
+++ b/Lib/fontTools/ttLib/tables/C_P_A_L_.py
@@ -3,7 +3,7 @@
# Google Author(s): Behdad Esfahbod
import operator
-import DefaultTable
+from . import DefaultTable
import struct
from fontTools.ttLib import sfnt
from fontTools.misc.textTools import safeEval, readHex
diff --git a/Lib/fontTools/ttLib/tables/D_S_I_G_.py b/Lib/fontTools/ttLib/tables/D_S_I_G_.py
index 995069d..7dfe3fd 100644
--- a/Lib/fontTools/ttLib/tables/D_S_I_G_.py
+++ b/Lib/fontTools/ttLib/tables/D_S_I_G_.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
from fontTools.misc.textTools import safeEval
from fontTools.misc import sstruct
diff --git a/Lib/fontTools/ttLib/tables/E_B_D_T_.py b/Lib/fontTools/ttLib/tables/E_B_D_T_.py
index 4b033ec..6ab1e05 100644
--- a/Lib/fontTools/ttLib/tables/E_B_D_T_.py
+++ b/Lib/fontTools/ttLib/tables/E_B_D_T_.py
@@ -1,5 +1,5 @@
-import DefaultTable
+from . import DefaultTable
import os
import string
import struct
@@ -7,7 +7,7 @@
import itertools
from types import TupleType
from fontTools.misc.textTools import safeEval, readHex, hexStr, deHexStr
-from BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat
+from .BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat
ebdtTableVersionFormat = """
> # big endian
diff --git a/Lib/fontTools/ttLib/tables/E_B_L_C_.py b/Lib/fontTools/ttLib/tables/E_B_L_C_.py
index c7e2f89..9c671c5 100644
--- a/Lib/fontTools/ttLib/tables/E_B_L_C_.py
+++ b/Lib/fontTools/ttLib/tables/E_B_L_C_.py
@@ -1,5 +1,5 @@
-import DefaultTable
+from . import DefaultTable
import string
import struct
from fontTools.misc import sstruct
@@ -7,7 +7,7 @@
from types import TupleType
from collections import deque
from fontTools.misc.textTools import safeEval
-from BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat
+from .BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat
eblcHeaderFormat = """
> # big endian
diff --git a/Lib/fontTools/ttLib/tables/G_D_E_F_.py b/Lib/fontTools/ttLib/tables/G_D_E_F_.py
index d763a5d..d4a5741 100644
--- a/Lib/fontTools/ttLib/tables/G_D_E_F_.py
+++ b/Lib/fontTools/ttLib/tables/G_D_E_F_.py
@@ -1,4 +1,4 @@
-from otBase import BaseTTXConverter
+from .otBase import BaseTTXConverter
class table_G_D_E_F_(BaseTTXConverter):
diff --git a/Lib/fontTools/ttLib/tables/G_M_A_P_.py b/Lib/fontTools/ttLib/tables/G_M_A_P_.py
index c4f64f9..848fc6d 100644
--- a/Lib/fontTools/ttLib/tables/G_M_A_P_.py
+++ b/Lib/fontTools/ttLib/tables/G_M_A_P_.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
from fontTools.misc import sstruct
from types import StringType
from fontTools.misc.textTools import safeEval, num2binary, binary2num
diff --git a/Lib/fontTools/ttLib/tables/G_P_K_G_.py b/Lib/fontTools/ttLib/tables/G_P_K_G_.py
index 6321093..0654c02 100644
--- a/Lib/fontTools/ttLib/tables/G_P_K_G_.py
+++ b/Lib/fontTools/ttLib/tables/G_P_K_G_.py
@@ -1,5 +1,5 @@
import sys
-import DefaultTable
+from . import DefaultTable
from fontTools.misc import sstruct
import array
from types import StringType
diff --git a/Lib/fontTools/ttLib/tables/G_P_O_S_.py b/Lib/fontTools/ttLib/tables/G_P_O_S_.py
index 52f44d4..013c820 100644
--- a/Lib/fontTools/ttLib/tables/G_P_O_S_.py
+++ b/Lib/fontTools/ttLib/tables/G_P_O_S_.py
@@ -1,4 +1,4 @@
-from otBase import BaseTTXConverter
+from .otBase import BaseTTXConverter
class table_G_P_O_S_(BaseTTXConverter):
diff --git a/Lib/fontTools/ttLib/tables/G_S_U_B_.py b/Lib/fontTools/ttLib/tables/G_S_U_B_.py
index a523c59..4403649 100644
--- a/Lib/fontTools/ttLib/tables/G_S_U_B_.py
+++ b/Lib/fontTools/ttLib/tables/G_S_U_B_.py
@@ -1,4 +1,4 @@
-from otBase import BaseTTXConverter
+from .otBase import BaseTTXConverter
class table_G_S_U_B_(BaseTTXConverter):
diff --git a/Lib/fontTools/ttLib/tables/J_S_T_F_.py b/Lib/fontTools/ttLib/tables/J_S_T_F_.py
index 8ff395e..ddf5405 100644
--- a/Lib/fontTools/ttLib/tables/J_S_T_F_.py
+++ b/Lib/fontTools/ttLib/tables/J_S_T_F_.py
@@ -1,4 +1,4 @@
-from otBase import BaseTTXConverter
+from .otBase import BaseTTXConverter
class table_J_S_T_F_(BaseTTXConverter):
diff --git a/Lib/fontTools/ttLib/tables/L_T_S_H_.py b/Lib/fontTools/ttLib/tables/L_T_S_H_.py
index 6cd5aad..83a4fff 100644
--- a/Lib/fontTools/ttLib/tables/L_T_S_H_.py
+++ b/Lib/fontTools/ttLib/tables/L_T_S_H_.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
import array
import struct
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 b8fb640..fe09d61 100644
--- a/Lib/fontTools/ttLib/tables/M_E_T_A_.py
+++ b/Lib/fontTools/ttLib/tables/M_E_T_A_.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
import struct
from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval
diff --git a/Lib/fontTools/ttLib/tables/O_S_2f_2.py b/Lib/fontTools/ttLib/tables/O_S_2f_2.py
index eb3cb01..a94248a 100644
--- a/Lib/fontTools/ttLib/tables/O_S_2f_2.py
+++ b/Lib/fontTools/ttLib/tables/O_S_2f_2.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval, num2binary, binary2num
from types import TupleType
diff --git a/Lib/fontTools/ttLib/tables/S_I_N_G_.py b/Lib/fontTools/ttLib/tables/S_I_N_G_.py
index 3f76c93..5415f27 100644
--- a/Lib/fontTools/ttLib/tables/S_I_N_G_.py
+++ b/Lib/fontTools/ttLib/tables/S_I_N_G_.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
from fontTools.misc import sstruct
import struct
import time
diff --git a/Lib/fontTools/ttLib/tables/S_V_G_.py b/Lib/fontTools/ttLib/tables/S_V_G_.py
index 84e77ad..1800d52 100644
--- a/Lib/fontTools/ttLib/tables/S_V_G_.py
+++ b/Lib/fontTools/ttLib/tables/S_V_G_.py
@@ -42,7 +42,7 @@
"""
-import DefaultTable
+from . import DefaultTable
import struct
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 31608f8..5cc54e2 100644
--- a/Lib/fontTools/ttLib/tables/T_S_I_B_.py
+++ b/Lib/fontTools/ttLib/tables/T_S_I_B_.py
@@ -1,4 +1,4 @@
-import asciiTable
+from . import asciiTable
class table_T_S_I_B_(asciiTable.asciiTable):
pass
diff --git a/Lib/fontTools/ttLib/tables/T_S_I_D_.py b/Lib/fontTools/ttLib/tables/T_S_I_D_.py
index 0388405..8228f8a 100644
--- a/Lib/fontTools/ttLib/tables/T_S_I_D_.py
+++ b/Lib/fontTools/ttLib/tables/T_S_I_D_.py
@@ -1,4 +1,4 @@
-import asciiTable
+from . import asciiTable
class table_T_S_I_D_(asciiTable.asciiTable):
pass
diff --git a/Lib/fontTools/ttLib/tables/T_S_I_J_.py b/Lib/fontTools/ttLib/tables/T_S_I_J_.py
index 8f6ed8b..0983b57 100644
--- a/Lib/fontTools/ttLib/tables/T_S_I_J_.py
+++ b/Lib/fontTools/ttLib/tables/T_S_I_J_.py
@@ -1,4 +1,4 @@
-import asciiTable
+from . import asciiTable
class table_T_S_I_J_(asciiTable.asciiTable):
pass
diff --git a/Lib/fontTools/ttLib/tables/T_S_I_P_.py b/Lib/fontTools/ttLib/tables/T_S_I_P_.py
index f0de28d..e34a18c 100644
--- a/Lib/fontTools/ttLib/tables/T_S_I_P_.py
+++ b/Lib/fontTools/ttLib/tables/T_S_I_P_.py
@@ -1,4 +1,4 @@
-import asciiTable
+from . import asciiTable
class table_T_S_I_P_(asciiTable.asciiTable):
pass
diff --git a/Lib/fontTools/ttLib/tables/T_S_I_S_.py b/Lib/fontTools/ttLib/tables/T_S_I_S_.py
index fc98317..56373e6 100644
--- a/Lib/fontTools/ttLib/tables/T_S_I_S_.py
+++ b/Lib/fontTools/ttLib/tables/T_S_I_S_.py
@@ -1,4 +1,4 @@
-import asciiTable
+from . import asciiTable
class table_T_S_I_S_(asciiTable.asciiTable):
pass
diff --git a/Lib/fontTools/ttLib/tables/T_S_I_V_.py b/Lib/fontTools/ttLib/tables/T_S_I_V_.py
index 928b7ce..a87e3f7 100644
--- a/Lib/fontTools/ttLib/tables/T_S_I_V_.py
+++ b/Lib/fontTools/ttLib/tables/T_S_I_V_.py
@@ -1,4 +1,4 @@
-import asciiTable
+from . import asciiTable
class table_T_S_I_V_(asciiTable.asciiTable):
pass
diff --git a/Lib/fontTools/ttLib/tables/T_S_I__0.py b/Lib/fontTools/ttLib/tables/T_S_I__0.py
index c527818..d06de64 100644
--- a/Lib/fontTools/ttLib/tables/T_S_I__0.py
+++ b/Lib/fontTools/ttLib/tables/T_S_I__0.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
import struct
tsi0Format = '>HHl'
diff --git a/Lib/fontTools/ttLib/tables/T_S_I__1.py b/Lib/fontTools/ttLib/tables/T_S_I__1.py
index 7572e29..03b15a1 100644
--- a/Lib/fontTools/ttLib/tables/T_S_I__1.py
+++ b/Lib/fontTools/ttLib/tables/T_S_I__1.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
import string
class table_T_S_I__1(DefaultTable.DefaultTable):
diff --git a/Lib/fontTools/ttLib/tables/T_S_I__5.py b/Lib/fontTools/ttLib/tables/T_S_I__5.py
index f714b82..4d635b3 100644
--- a/Lib/fontTools/ttLib/tables/T_S_I__5.py
+++ b/Lib/fontTools/ttLib/tables/T_S_I__5.py
@@ -1,5 +1,5 @@
import sys
-import DefaultTable
+from . import DefaultTable
import array
from fontTools import ttLib
from fontTools.misc.textTools import safeEval
diff --git a/Lib/fontTools/ttLib/tables/V_O_R_G_.py b/Lib/fontTools/ttLib/tables/V_O_R_G_.py
index b8438f1..d2741a6 100644
--- a/Lib/fontTools/ttLib/tables/V_O_R_G_.py
+++ b/Lib/fontTools/ttLib/tables/V_O_R_G_.py
@@ -1,5 +1,5 @@
import operator
-import DefaultTable
+from . import DefaultTable
import struct
from fontTools.ttLib import sfnt
from fontTools.misc.textTools import safeEval, readHex
diff --git a/Lib/fontTools/ttLib/tables/__init__.py b/Lib/fontTools/ttLib/tables/__init__.py
index 205af81..108aed1 100644
--- a/Lib/fontTools/ttLib/tables/__init__.py
+++ b/Lib/fontTools/ttLib/tables/__init__.py
@@ -3,52 +3,52 @@
"""Dummy function to let modulefinder know what tables may be
dynamically imported. Generated by MetaTools/buildTableList.py.
"""
- import B_A_S_E_
- import C_B_D_T_
- import C_B_L_C_
- import C_F_F_
- import C_O_L_R_
- import C_P_A_L_
- import D_S_I_G_
- import E_B_D_T_
- import E_B_L_C_
- import G_D_E_F_
- import G_M_A_P_
- import G_P_K_G_
- import G_P_O_S_
- import G_S_U_B_
- import J_S_T_F_
- import L_T_S_H_
- import M_E_T_A_
- import O_S_2f_2
- import S_I_N_G_
- import S_V_G_
- import T_S_I_B_
- import T_S_I_D_
- import T_S_I_J_
- import T_S_I_P_
- import T_S_I_S_
- import T_S_I_V_
- import T_S_I__0
- import T_S_I__1
- import T_S_I__2
- import T_S_I__3
- import T_S_I__5
- import V_O_R_G_
- import _c_m_a_p
- import _c_v_t
- import _f_p_g_m
- import _g_a_s_p
- import _g_l_y_f
- import _h_d_m_x
- import _h_e_a_d
- import _h_h_e_a
- import _h_m_t_x
- import _k_e_r_n
- import _l_o_c_a
- import _m_a_x_p
- import _n_a_m_e
- import _p_o_s_t
- import _p_r_e_p
- import _v_h_e_a
- import _v_m_t_x
+ from . import B_A_S_E_
+ from . import C_B_D_T_
+ from . import C_B_L_C_
+ from . import C_F_F_
+ from . import C_O_L_R_
+ from . import C_P_A_L_
+ from . import D_S_I_G_
+ from . import E_B_D_T_
+ from . import E_B_L_C_
+ from . import G_D_E_F_
+ from . import G_M_A_P_
+ from . import G_P_K_G_
+ from . import G_P_O_S_
+ from . import G_S_U_B_
+ from . import J_S_T_F_
+ from . import L_T_S_H_
+ from . import M_E_T_A_
+ from . import O_S_2f_2
+ from . import S_I_N_G_
+ from . import S_V_G_
+ from . import T_S_I_B_
+ from . import T_S_I_D_
+ from . import T_S_I_J_
+ from . import T_S_I_P_
+ from . import T_S_I_S_
+ from . import T_S_I_V_
+ from . import T_S_I__0
+ from . import T_S_I__1
+ from . import T_S_I__2
+ from . import T_S_I__3
+ from . import T_S_I__5
+ from . import V_O_R_G_
+ from . import _c_m_a_p
+ from . import _c_v_t
+ from . import _f_p_g_m
+ from . import _g_a_s_p
+ from . import _g_l_y_f
+ from . import _h_d_m_x
+ from . import _h_e_a_d
+ from . import _h_h_e_a
+ from . import _h_m_t_x
+ from . import _k_e_r_n
+ from . import _l_o_c_a
+ from . import _m_a_x_p
+ from . import _n_a_m_e
+ from . import _p_o_s_t
+ from . import _p_r_e_p
+ from . import _v_h_e_a
+ from . import _v_m_t_x
diff --git a/Lib/fontTools/ttLib/tables/_c_m_a_p.py b/Lib/fontTools/ttLib/tables/_c_m_a_p.py
index 6c86533..4e10c20 100644
--- a/Lib/fontTools/ttLib/tables/_c_m_a_p.py
+++ b/Lib/fontTools/ttLib/tables/_c_m_a_p.py
@@ -1,5 +1,5 @@
import sys
-import DefaultTable
+from . import DefaultTable
import struct
import array
import operator
diff --git a/Lib/fontTools/ttLib/tables/_c_v_t.py b/Lib/fontTools/ttLib/tables/_c_v_t.py
index be08ca3..be06f6d 100644
--- a/Lib/fontTools/ttLib/tables/_c_v_t.py
+++ b/Lib/fontTools/ttLib/tables/_c_v_t.py
@@ -1,5 +1,5 @@
import sys
-import DefaultTable
+from . import DefaultTable
import array
from fontTools import ttLib
from fontTools.misc.textTools import safeEval
diff --git a/Lib/fontTools/ttLib/tables/_f_p_g_m.py b/Lib/fontTools/ttLib/tables/_f_p_g_m.py
index 6f7beee..cd0e28d 100644
--- a/Lib/fontTools/ttLib/tables/_f_p_g_m.py
+++ b/Lib/fontTools/ttLib/tables/_f_p_g_m.py
@@ -1,6 +1,6 @@
-import DefaultTable
+from . import DefaultTable
import array
-import ttProgram
+from . import ttProgram
class table__f_p_g_m(DefaultTable.DefaultTable):
diff --git a/Lib/fontTools/ttLib/tables/_g_a_s_p.py b/Lib/fontTools/ttLib/tables/_g_a_s_p.py
index 43f513f..ec31ca4 100644
--- a/Lib/fontTools/ttLib/tables/_g_a_s_p.py
+++ b/Lib/fontTools/ttLib/tables/_g_a_s_p.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
import struct
from fontTools.misc.textTools import safeEval
diff --git a/Lib/fontTools/ttLib/tables/_g_l_y_f.py b/Lib/fontTools/ttLib/tables/_g_l_y_f.py
index c406144..2c2fd47 100644
--- a/Lib/fontTools/ttLib/tables/_g_l_y_f.py
+++ b/Lib/fontTools/ttLib/tables/_g_l_y_f.py
@@ -17,11 +17,11 @@
import sys
import struct
from fontTools.misc import sstruct
-import DefaultTable
+from . import DefaultTable
from fontTools import ttLib
from fontTools.misc.textTools import safeEval, readHex
from fontTools.misc.arrayTools import calcBounds
-import ttProgram
+from . import ttProgram
import array
from types import StringType, TupleType
import warnings
diff --git a/Lib/fontTools/ttLib/tables/_h_d_m_x.py b/Lib/fontTools/ttLib/tables/_h_d_m_x.py
index 592f426..d4652b8 100644
--- a/Lib/fontTools/ttLib/tables/_h_d_m_x.py
+++ b/Lib/fontTools/ttLib/tables/_h_d_m_x.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
from fontTools.misc import sstruct
import string
diff --git a/Lib/fontTools/ttLib/tables/_h_e_a_d.py b/Lib/fontTools/ttLib/tables/_h_e_a_d.py
index 61d9a16..e4730bf 100644
--- a/Lib/fontTools/ttLib/tables/_h_e_a_d.py
+++ b/Lib/fontTools/ttLib/tables/_h_e_a_d.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
from fontTools.misc import sstruct
import time
import string
diff --git a/Lib/fontTools/ttLib/tables/_h_h_e_a.py b/Lib/fontTools/ttLib/tables/_h_h_e_a.py
index 71c1221..33e935c 100644
--- a/Lib/fontTools/ttLib/tables/_h_h_e_a.py
+++ b/Lib/fontTools/ttLib/tables/_h_h_e_a.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
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 1b1e200..c54e142 100644
--- a/Lib/fontTools/ttLib/tables/_h_m_t_x.py
+++ b/Lib/fontTools/ttLib/tables/_h_m_t_x.py
@@ -1,5 +1,5 @@
import sys
-import DefaultTable
+from . import DefaultTable
import array
from fontTools import ttLib
from fontTools.misc.textTools import safeEval
diff --git a/Lib/fontTools/ttLib/tables/_k_e_r_n.py b/Lib/fontTools/ttLib/tables/_k_e_r_n.py
index acb3b95..ac3889b 100644
--- a/Lib/fontTools/ttLib/tables/_k_e_r_n.py
+++ b/Lib/fontTools/ttLib/tables/_k_e_r_n.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
import struct
from fontTools.ttLib import sfnt
from fontTools.misc.textTools import safeEval, readHex
diff --git a/Lib/fontTools/ttLib/tables/_l_o_c_a.py b/Lib/fontTools/ttLib/tables/_l_o_c_a.py
index 21c31ad..09668aa 100644
--- a/Lib/fontTools/ttLib/tables/_l_o_c_a.py
+++ b/Lib/fontTools/ttLib/tables/_l_o_c_a.py
@@ -1,5 +1,5 @@
import sys
-import DefaultTable
+from . import DefaultTable
import array
from fontTools import ttLib
import struct
diff --git a/Lib/fontTools/ttLib/tables/_m_a_x_p.py b/Lib/fontTools/ttLib/tables/_m_a_x_p.py
index 8c9905b..9a88c6a 100644
--- a/Lib/fontTools/ttLib/tables/_m_a_x_p.py
+++ b/Lib/fontTools/ttLib/tables/_m_a_x_p.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval
diff --git a/Lib/fontTools/ttLib/tables/_n_a_m_e.py b/Lib/fontTools/ttLib/tables/_n_a_m_e.py
index 91abab4..d3e8093 100644
--- a/Lib/fontTools/ttLib/tables/_n_a_m_e.py
+++ b/Lib/fontTools/ttLib/tables/_n_a_m_e.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
import struct
from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval
diff --git a/Lib/fontTools/ttLib/tables/_p_o_s_t.py b/Lib/fontTools/ttLib/tables/_p_o_s_t.py
index 7c84c50..5b5ef65 100644
--- a/Lib/fontTools/ttLib/tables/_p_o_s_t.py
+++ b/Lib/fontTools/ttLib/tables/_p_o_s_t.py
@@ -1,6 +1,6 @@
import sys
from fontTools.ttLib.standardGlyphOrder import standardGlyphOrder
-import DefaultTable
+from . import DefaultTable
import struct
from fontTools.misc import sstruct
import array
diff --git a/Lib/fontTools/ttLib/tables/_v_h_e_a.py b/Lib/fontTools/ttLib/tables/_v_h_e_a.py
index da0397c..b131f9f 100644
--- a/Lib/fontTools/ttLib/tables/_v_h_e_a.py
+++ b/Lib/fontTools/ttLib/tables/_v_h_e_a.py
@@ -1,4 +1,4 @@
-import DefaultTable
+from . import DefaultTable
from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval
diff --git a/Lib/fontTools/ttLib/tables/asciiTable.py b/Lib/fontTools/ttLib/tables/asciiTable.py
index ee9455d..623f53d 100644
--- a/Lib/fontTools/ttLib/tables/asciiTable.py
+++ b/Lib/fontTools/ttLib/tables/asciiTable.py
@@ -1,5 +1,5 @@
import string
-import DefaultTable
+from . import DefaultTable
class asciiTable(DefaultTable.DefaultTable):
diff --git a/Lib/fontTools/ttLib/tables/otBase.py b/Lib/fontTools/ttLib/tables/otBase.py
index 5c432b4..d4f950a 100644
--- a/Lib/fontTools/ttLib/tables/otBase.py
+++ b/Lib/fontTools/ttLib/tables/otBase.py
@@ -1,5 +1,5 @@
-from DefaultTable import DefaultTable
-import otData
+from .DefaultTable import DefaultTable
+from . import otData
import struct
from types import TupleType
@@ -30,7 +30,7 @@
"""
def decompile(self, data, font):
- import otTables
+ from . import otTables
cachingStats = None if True else {}
class GlobalState:
def __init__(self, tableType, cachingStats):
@@ -87,7 +87,7 @@
self.table.toXML2(writer, font)
def fromXML(self, (name, attrs, content), font):
- import otTables
+ from . import otTables
if not hasattr(self, "table"):
tableClass = getattr(otTables, self.tableTag)
self.table = tableClass()
@@ -763,7 +763,7 @@
value = reader.readUShort()
if isDevice:
if value:
- import otTables
+ from . import otTables
subReader = reader.getSubReader(value)
value = getattr(otTables, name)()
value.decompile(subReader, font)
@@ -825,7 +825,7 @@
xmlWriter.newline()
def fromXML(self, (name, attrs, content), font):
- import otTables
+ from . import otTables
for k, v in attrs.items():
setattr(self, k, int(v))
for element in content:
diff --git a/Lib/fontTools/ttLib/tables/otConverters.py b/Lib/fontTools/ttLib/tables/otConverters.py
index 36cb755..86dc804 100644
--- a/Lib/fontTools/ttLib/tables/otConverters.py
+++ b/Lib/fontTools/ttLib/tables/otConverters.py
@@ -1,6 +1,6 @@
from types import TupleType
from fontTools.misc.textTools import safeEval
-from otBase import ValueRecordFactory
+from .otBase import ValueRecordFactory
def buildConverters(tableSpec, tableNamespace):
@@ -298,7 +298,7 @@
else:
value.toXML(xmlWriter, font, self.name, attrs)
def xmlRead(self, attrs, content, font):
- from otBase import ValueRecord
+ from .otBase import ValueRecord
value = ValueRecord()
value.fromXML((None, attrs, content), font)
return value
diff --git a/Lib/fontTools/ttLib/tables/otTables.py b/Lib/fontTools/ttLib/tables/otTables.py
index 6068c11..01a45df 100644
--- a/Lib/fontTools/ttLib/tables/otTables.py
+++ b/Lib/fontTools/ttLib/tables/otTables.py
@@ -5,7 +5,7 @@
converter objects from otConverters.py.
"""
import operator
-from otBase import BaseTable, FormatSwitchingBaseTable
+from .otBase import BaseTable, FormatSwitchingBaseTable
from types import TupleType
import warnings
@@ -649,7 +649,7 @@
def _buildClasses():
import new, re
- from otData import otData
+ from .otData import otData
formatPat = re.compile("([A-Za-z0-9]+)Format(\d+)$")
namespace = globals()
@@ -711,7 +711,7 @@
featureParamTypes['cv%02d' % i] = FeatureParamsCharacterVariants
# add converters to classes
- from otConverters import buildConverters
+ from .otConverters import buildConverters
for name, table in otData:
m = formatPat.match(name)
if m: