Move sstruct under fontTools.misc

Our footprint in the Python module namespace is all under
fontTools now.  User code importing sstruct should be updated
to say "from fontTools.misc import sstruct".
This commit is contained in:
Behdad Esfahbod 2013-09-17 16:59:39 -04:00
parent f65033e277
commit 8413c108d2
25 changed files with 33 additions and 24 deletions

View File

@ -4,7 +4,8 @@
# $Id: cffLib.py,v 1.34 2008-03-07 19:56:17 jvr Exp $ # $Id: cffLib.py,v 1.34 2008-03-07 19:56:17 jvr Exp $
# #
import struct, sstruct import struct
from fontTools.misc import sstruct
import string import string
from fontTools.misc import psCharStrings from fontTools.misc import psCharStrings
from fontTools.misc.textTools import safeEval from fontTools.misc.textTools import safeEval

View File

@ -1,5 +1,6 @@
import os import os
import struct, sstruct import struct
from fontTools.misc import sstruct
import string import string
try: try:
from Carbon import Res from Carbon import Res

View File

@ -1,6 +1,6 @@
"""Mac-only module to find the home file of a resource.""" """Mac-only module to find the home file of a resource."""
import sstruct from fontTools.misc import sstruct
import array import array
import calldll import calldll
import macfs, Res import macfs, Res

View File

@ -1,4 +1,5 @@
import struct, sstruct import struct
from fontTools.misc import sstruct
import string import string
import types import types

View File

@ -13,7 +13,8 @@ a table's length chages you need to rewrite the whole file anyway.
""" """
import sys import sys
import struct, sstruct import struct
from fontTools.misc import sstruct
import os import os

View File

@ -1,6 +1,6 @@
# Since bitmap glyph metrics are shared between EBLC and EBDT # Since bitmap glyph metrics are shared between EBLC and EBDT
# this class gets its own python file. # this class gets its own python file.
import sstruct from fontTools.misc import sstruct
from types import TupleType from types import TupleType
from fontTools.misc.textTools import safeEval from fontTools.misc.textTools import safeEval

View File

@ -2,7 +2,7 @@
import E_B_D_T_ import E_B_D_T_
import string import string
import struct import struct
import sstruct from fontTools.misc import sstruct
from BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat from BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat
from E_B_D_T_ import BitmapGlyph, BitmapPlusSmallMetricsMixin, BitmapPlusBigMetricsMixin from E_B_D_T_ import BitmapGlyph, BitmapPlusSmallMetricsMixin, BitmapPlusBigMetricsMixin

View File

@ -1,6 +1,6 @@
import DefaultTable import DefaultTable
from fontTools.misc.textTools import safeEval from fontTools.misc.textTools import safeEval
import sstruct from fontTools.misc import sstruct
DSIG_HeaderFormat = """ DSIG_HeaderFormat = """
> # big endian > # big endian

View File

@ -3,7 +3,7 @@ import DefaultTable
import os import os
import string import string
import struct import struct
import sstruct from fontTools.misc import sstruct
import itertools import itertools
from types import TupleType from types import TupleType
from fontTools.misc.textTools import safeEval, readHex, hexStr, deHexStr from fontTools.misc.textTools import safeEval, readHex, hexStr, deHexStr

View File

@ -2,7 +2,7 @@
import DefaultTable import DefaultTable
import string import string
import struct import struct
import sstruct from fontTools.misc import sstruct
import itertools import itertools
from types import TupleType from types import TupleType
from collections import deque from collections import deque

View File

@ -1,5 +1,5 @@
import DefaultTable import DefaultTable
import sstruct from fontTools.misc import sstruct
from types import StringType from types import StringType
from fontTools.misc.textTools import safeEval, num2binary, binary2num from fontTools.misc.textTools import safeEval, num2binary, binary2num

View File

@ -1,6 +1,6 @@
import sys import sys
import DefaultTable import DefaultTable
import sstruct from fontTools.misc import sstruct
import array import array
from types import StringType from types import StringType
from fontTools.misc.textTools import safeEval, readHex from fontTools.misc.textTools import safeEval, readHex

View File

@ -1,5 +1,6 @@
import DefaultTable import DefaultTable
import struct, sstruct import struct
from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval from fontTools.misc.textTools import safeEval
import string import string
from types import FloatType, ListType, StringType, TupleType from types import FloatType, ListType, StringType, TupleType

View File

@ -1,5 +1,5 @@
import DefaultTable import DefaultTable
import sstruct from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval, num2binary, binary2num from fontTools.misc.textTools import safeEval, num2binary, binary2num
from types import TupleType from types import TupleType

View File

@ -1,5 +1,5 @@
import DefaultTable import DefaultTable
import sstruct from fontTools.misc import sstruct
import struct import struct
import time import time
import string import string

View File

@ -43,7 +43,8 @@ the number of <colorParamUINameID> elements.
""" """
import DefaultTable import DefaultTable
import struct, sstruct import struct
from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval from fontTools.misc.textTools import safeEval
try: try:
import xml.etree.cElementTree as ET import xml.etree.cElementTree as ET

View File

@ -15,7 +15,8 @@ SCALE_COMPONENT_OFFSET_DEFAULT = 0 # 0 == MS, 1 == Apple
import sys import sys
import struct, sstruct import struct
from fontTools.misc import sstruct
import DefaultTable import DefaultTable
from fontTools import ttLib from fontTools import ttLib
from fontTools.misc.textTools import safeEval, readHex from fontTools.misc.textTools import safeEval, readHex

View File

@ -1,5 +1,5 @@
import DefaultTable import DefaultTable
import sstruct from fontTools.misc import sstruct
import string import string
hdmxHeaderFormat = """ hdmxHeaderFormat = """

View File

@ -1,5 +1,5 @@
import DefaultTable import DefaultTable
import sstruct from fontTools.misc import sstruct
import time import time
import string import string
from fontTools.misc.textTools import safeEval, num2binary, binary2num from fontTools.misc.textTools import safeEval, num2binary, binary2num

View File

@ -1,5 +1,5 @@
import DefaultTable import DefaultTable
import sstruct from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval from fontTools.misc.textTools import safeEval

View File

@ -1,5 +1,5 @@
import DefaultTable import DefaultTable
import sstruct from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval from fontTools.misc.textTools import safeEval
maxpFormat_0_5 = """ maxpFormat_0_5 = """

View File

@ -1,5 +1,6 @@
import DefaultTable import DefaultTable
import struct, sstruct import struct
from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval from fontTools.misc.textTools import safeEval
import string import string
import types import types

View File

@ -1,7 +1,8 @@
import sys import sys
from fontTools.ttLib.standardGlyphOrder import standardGlyphOrder from fontTools.ttLib.standardGlyphOrder import standardGlyphOrder
import DefaultTable import DefaultTable
import struct, sstruct import struct
from fontTools.misc import sstruct
import array import array
from fontTools import ttLib from fontTools import ttLib
from fontTools.misc.textTools import safeEval, readHex from fontTools.misc.textTools import safeEval, readHex

View File

@ -1,5 +1,5 @@
import DefaultTable import DefaultTable
import sstruct from fontTools.misc import sstruct
from fontTools.misc.textTools import safeEval from fontTools.misc.textTools import safeEval
vheaFormat = """ vheaFormat = """