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:
parent
f65033e277
commit
8413c108d2
@ -4,7 +4,8 @@
|
||||
# $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
|
||||
from fontTools.misc import psCharStrings
|
||||
from fontTools.misc.textTools import safeEval
|
||||
|
@ -1,5 +1,6 @@
|
||||
import os
|
||||
import struct, sstruct
|
||||
import struct
|
||||
from fontTools.misc import sstruct
|
||||
import string
|
||||
try:
|
||||
from Carbon import Res
|
||||
|
@ -1,6 +1,6 @@
|
||||
"""Mac-only module to find the home file of a resource."""
|
||||
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
import array
|
||||
import calldll
|
||||
import macfs, Res
|
||||
|
@ -1,4 +1,5 @@
|
||||
import struct, sstruct
|
||||
import struct
|
||||
from fontTools.misc import sstruct
|
||||
import string
|
||||
import types
|
||||
|
||||
|
@ -13,7 +13,8 @@ a table's length chages you need to rewrite the whole file anyway.
|
||||
"""
|
||||
|
||||
import sys
|
||||
import struct, sstruct
|
||||
import struct
|
||||
from fontTools.misc import sstruct
|
||||
import os
|
||||
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Since bitmap glyph metrics are shared between EBLC and EBDT
|
||||
# this class gets its own python file.
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
from types import TupleType
|
||||
from fontTools.misc.textTools import safeEval
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
import E_B_D_T_
|
||||
import string
|
||||
import struct
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
from BitmapGlyphMetrics import BigGlyphMetrics, bigGlyphMetricsFormat, SmallGlyphMetrics, smallGlyphMetricsFormat
|
||||
from E_B_D_T_ import BitmapGlyph, BitmapPlusSmallMetricsMixin, BitmapPlusBigMetricsMixin
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
import DefaultTable
|
||||
from fontTools.misc.textTools import safeEval
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
|
||||
DSIG_HeaderFormat = """
|
||||
> # big endian
|
||||
|
@ -3,7 +3,7 @@ import DefaultTable
|
||||
import os
|
||||
import string
|
||||
import struct
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
import itertools
|
||||
from types import TupleType
|
||||
from fontTools.misc.textTools import safeEval, readHex, hexStr, deHexStr
|
||||
|
@ -2,7 +2,7 @@
|
||||
import DefaultTable
|
||||
import string
|
||||
import struct
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
import itertools
|
||||
from types import TupleType
|
||||
from collections import deque
|
||||
|
@ -1,5 +1,5 @@
|
||||
import DefaultTable
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
from types import StringType
|
||||
from fontTools.misc.textTools import safeEval, num2binary, binary2num
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
import sys
|
||||
import DefaultTable
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
import array
|
||||
from types import StringType
|
||||
from fontTools.misc.textTools import safeEval, readHex
|
||||
|
@ -1,5 +1,6 @@
|
||||
import DefaultTable
|
||||
import struct, sstruct
|
||||
import struct
|
||||
from fontTools.misc import sstruct
|
||||
from fontTools.misc.textTools import safeEval
|
||||
import string
|
||||
from types import FloatType, ListType, StringType, TupleType
|
||||
|
@ -1,5 +1,5 @@
|
||||
import DefaultTable
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
from fontTools.misc.textTools import safeEval, num2binary, binary2num
|
||||
from types import TupleType
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import DefaultTable
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
import struct
|
||||
import time
|
||||
import string
|
||||
|
@ -43,7 +43,8 @@ the number of <colorParamUINameID> elements.
|
||||
"""
|
||||
|
||||
import DefaultTable
|
||||
import struct, sstruct
|
||||
import struct
|
||||
from fontTools.misc import sstruct
|
||||
from fontTools.misc.textTools import safeEval
|
||||
try:
|
||||
import xml.etree.cElementTree as ET
|
||||
|
@ -15,7 +15,8 @@ SCALE_COMPONENT_OFFSET_DEFAULT = 0 # 0 == MS, 1 == Apple
|
||||
|
||||
|
||||
import sys
|
||||
import struct, sstruct
|
||||
import struct
|
||||
from fontTools.misc import sstruct
|
||||
import DefaultTable
|
||||
from fontTools import ttLib
|
||||
from fontTools.misc.textTools import safeEval, readHex
|
||||
|
@ -1,5 +1,5 @@
|
||||
import DefaultTable
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
import string
|
||||
|
||||
hdmxHeaderFormat = """
|
||||
|
@ -1,5 +1,5 @@
|
||||
import DefaultTable
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
import time
|
||||
import string
|
||||
from fontTools.misc.textTools import safeEval, num2binary, binary2num
|
||||
|
@ -1,5 +1,5 @@
|
||||
import DefaultTable
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
from fontTools.misc.textTools import safeEval
|
||||
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import DefaultTable
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
from fontTools.misc.textTools import safeEval
|
||||
|
||||
maxpFormat_0_5 = """
|
||||
|
@ -1,5 +1,6 @@
|
||||
import DefaultTable
|
||||
import struct, sstruct
|
||||
import struct
|
||||
from fontTools.misc import sstruct
|
||||
from fontTools.misc.textTools import safeEval
|
||||
import string
|
||||
import types
|
||||
|
@ -1,7 +1,8 @@
|
||||
import sys
|
||||
from fontTools.ttLib.standardGlyphOrder import standardGlyphOrder
|
||||
import DefaultTable
|
||||
import struct, sstruct
|
||||
import struct
|
||||
from fontTools.misc import sstruct
|
||||
import array
|
||||
from fontTools import ttLib
|
||||
from fontTools.misc.textTools import safeEval, readHex
|
||||
|
@ -1,5 +1,5 @@
|
||||
import DefaultTable
|
||||
import sstruct
|
||||
from fontTools.misc import sstruct
|
||||
from fontTools.misc.textTools import safeEval
|
||||
|
||||
vheaFormat = """
|
||||
|
Loading…
x
Reference in New Issue
Block a user