From 1b8cde1b6f005d3c9c1b2aadf11a0519cc02f15e Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 6 Dec 2013 19:41:49 -0500 Subject: [PATCH] Fix imports --- Lib/fontTools/ttLib/tables/_s_b_i_x.py | 14 ++++++++------ Lib/fontTools/ttLib/tables/sbixBitmap.py | 6 +++++- Lib/fontTools/ttLib/tables/sbixBitmapSet.py | 10 ++++++---- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Lib/fontTools/ttLib/tables/_s_b_i_x.py b/Lib/fontTools/ttLib/tables/_s_b_i_x.py index 90c66d15b..d24db023c 100644 --- a/Lib/fontTools/ttLib/tables/_s_b_i_x.py +++ b/Lib/fontTools/ttLib/tables/_s_b_i_x.py @@ -1,9 +1,11 @@ -import DefaultTable -import struct, sstruct -#from fontTools.misc.textTools import readHex -from types import TupleType -from sbixBitmapSet import * -from sbixBitmap import * +from __future__ import print_function, division +from fontTools.misc.py23 import * +from fontTools.misc import sstruct +from fontTools.misc.textTools import readHex +from . import DefaultTable +from .sbixBitmap import * +from .sbixBitmapSet import * +import struct """ sbix Table organization: diff --git a/Lib/fontTools/ttLib/tables/sbixBitmap.py b/Lib/fontTools/ttLib/tables/sbixBitmap.py index 1d22eeb85..10bb2f216 100644 --- a/Lib/fontTools/ttLib/tables/sbixBitmap.py +++ b/Lib/fontTools/ttLib/tables/sbixBitmap.py @@ -1,5 +1,9 @@ -import struct, sstruct +from __future__ import print_function, division +from fontTools.misc.py23 import * +from fontTools.misc import sstruct from fontTools.misc.textTools import readHex +import struct + sbixBitmapHeaderFormat = """ > diff --git a/Lib/fontTools/ttLib/tables/sbixBitmapSet.py b/Lib/fontTools/ttLib/tables/sbixBitmapSet.py index 8302f14e8..b27d86857 100644 --- a/Lib/fontTools/ttLib/tables/sbixBitmapSet.py +++ b/Lib/fontTools/ttLib/tables/sbixBitmapSet.py @@ -1,7 +1,9 @@ -import struct, sstruct -from types import TupleType -from sbixBitmap import * -#from fontTools.misc.textTools import hexStr +from __future__ import print_function, division +from fontTools.misc.py23 import * +from fontTools.misc import sstruct +from fontTools.misc.textTools import readHex +from .sbixBitmap import * +import struct sbixBitmapSetHeaderFormat = """ >