shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shorten exception names

Browse Source
This commit is contained in:
Simon Cozens 2021-03-18 20:58:11 +00:00
parent 6c547864b6
commit 3e0a87a146
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/fontTools/varLib/errors.py
View File

@ -72,7 +72,7 @@ class VarLibMergeError(VarLibError):
return "\n\n" + basic + location + self.details return "\n\n" + basic + location + self.details
class VarLibMergeFailureShouldBeConstant(VarLibMergeError): class ShouldBeConstant(VarLibMergeError):
"""some values were different, but should have been the same""" """some values were different, but should have been the same"""
@property @property
@ -98,7 +98,7 @@ class VarLibMergeFailureShouldBeConstant(VarLibMergeError):
) )
class VarLibMergeFailureFoundANone(VarLibMergeError): class FoundANone(VarLibMergeError):
"""one of the values in a list was empty when it shouldn't have been""" """one of the values in a list was empty when it shouldn't have been"""
@property @property
@ -113,37 +113,37 @@ class VarLibMergeFailureFoundANone(VarLibMergeError):
return f"{stack[0]}=={cause['got']}\n" return f"{stack[0]}=={cause['got']}\n"
class VarLibMergeFailureMismatchedTypes(VarLibMergeError): class MismatchedTypes(VarLibMergeError):
"""data had inconsistent types""" """data had inconsistent types"""
pass pass
class VarLibMergeFailureLengthsDiffer(VarLibMergeError): class LengthsDiffer(VarLibMergeError):
"""a list of objects had inconsistent lengths""" """a list of objects had inconsistent lengths"""
pass pass
class VarLibMergeFailureKeysDiffer(VarLibMergeError): class KeysDiffer(VarLibMergeError):
"""a list of objects had different keys""" """a list of objects had different keys"""
pass pass
class VarLibMergeFailureInconsistentGlyphOrder(VarLibMergeError): class InconsistentGlyphOrder(VarLibMergeError):
"""the glyph order was inconsistent between masters""" """the glyph order was inconsistent between masters"""
pass pass
class VarLibMergeFailureInconsistentExtensions(VarLibMergeError): class InconsistentExtensions(VarLibMergeError):
"""the masters use extension lookups in inconsistent ways""" """the masters use extension lookups in inconsistent ways"""
pass pass
class VarLibMergeFailureUnsupportedFormat(VarLibMergeError): class UnsupportedFormat(VarLibMergeError):
"""an OpenType subtable (%s) had a format I didn't expect""" """an OpenType subtable (%s) had a format I didn't expect"""
@property @property
@ -152,7 +152,7 @@ class VarLibMergeFailureUnsupportedFormat(VarLibMergeError):
return self.__doc__ % cause["subtable"] return self.__doc__ % cause["subtable"]
class VarLibMergeFailureUnsupportedFormat(VarLibMergeFailureUnsupportedFormat): class UnsupportedFormat(UnsupportedFormat):
"""an OpenType subtable (%s) had inconsistent formats between masters""" """an OpenType subtable (%s) had inconsistent formats between masters"""
pass pass

60
Lib/fontTools/varLib/merger.py
View File

@ -15,15 +15,15 @@ from functools import reduce
from fontTools.otlLib.builder import buildSinglePos from fontTools.otlLib.builder import buildSinglePos
from .errors import ( from .errors import (
VarLibMergeFailureShouldBeConstant, ShouldBeConstant,
VarLibMergeFailureFoundANone, FoundANone,
VarLibMergeFailureMismatchedTypes, MismatchedTypes,
VarLibMergeFailureLengthsDiffer, LengthsDiffer,
VarLibMergeFailureKeysDiffer, KeysDiffer,
VarLibMergeFailureInconsistentGlyphOrder, InconsistentGlyphOrder,
VarLibMergeFailureInconsistentExtensions, InconsistentExtensions,
VarLibMergeFailureUnsupportedFormat, UnsupportedFormat,
VarLibMergeFailureUnsupportedFormat, UnsupportedFormat,
VarLibMergeError, VarLibMergeError,
) )
@ -79,7 +79,7 @@ class Merger(object):
item.ensureDecompiled() item.ensureDecompiled()
keys = sorted(vars(out).keys()) keys = sorted(vars(out).keys())
if not all(keys == sorted(vars(v).keys()) for v in lst): if not all(keys == sorted(vars(v).keys()) for v in lst):
raise VarLibMergeFailureKeysDiffer(self, ({ raise KeysDiffer(self, ({
"expected": keys, "expected": keys,
"got": [sorted(vars(v).keys()) for v in lst]},)) "got": [sorted(vars(v).keys()) for v in lst]},))
mergers = self.mergersFor(out) mergers = self.mergersFor(out)
@ -97,7 +97,7 @@ class Merger(object):
def mergeLists(self, out, lst): def mergeLists(self, out, lst):
if not allEqualTo(out, lst, len): if not allEqualTo(out, lst, len):
raise VarLibMergeFailureLengthsDiffer(self, ({ raise LengthsDiffer(self, ({
"expected": len(out), "expected": len(out),
"got": [len(x) for x in lst]},)) "got": [len(x) for x in lst]},))
for i,(value,values) in enumerate(zip(out, zip(*lst))): for i,(value,values) in enumerate(zip(out, zip(*lst))):
@ -109,7 +109,7 @@ class Merger(object):
def mergeThings(self, out, lst): def mergeThings(self, out, lst):
if not allEqualTo(out, lst, type): if not allEqualTo(out, lst, type):
raise VarLibMergeFailureMismatchedTypes(self, ({ raise MismatchedTypes(self, ({
"expected": type(out), "expected": type(out),
"got": [type(x) for x in lst]},)) "got": [type(x) for x in lst]},))
mergerFunc = self.mergersFor(out).get(None, None) mergerFunc = self.mergersFor(out).get(None, None)
@ -121,7 +121,7 @@ class Merger(object):
self.mergeLists(out, lst) self.mergeLists(out, lst)
else: else:
if not allEqualTo(out, lst): if not allEqualTo(out, lst):
raise VarLibMergeFailureShouldBeConstant(self, ({ raise ShouldBeConstant(self, ({
"expected": out, "expected": out,
"got": lst},)) "got": lst},))
@ -146,7 +146,7 @@ class AligningMerger(Merger):
def merge(merger, self, lst): def merge(merger, self, lst):
if self is None: if self is None:
if not allNone(lst): if not allNone(lst):
raise VarLibMergeFailureNotANone(self, ({ raise NotANone(self, ({
"expected": None, "expected": None,
"got": lst "got": lst
},)) },))
@ -162,7 +162,7 @@ def merge(merger, self, lst):
for k in allKeys: for k in allKeys:
allValues = nonNone(l.get(k) for l in lst) allValues = nonNone(l.get(k) for l in lst)
if not allEqual(allValues): if not allEqual(allValues):
raise VarLibMergeFailureShouldBeConstant(self, ({ raise ShouldBeConstant(self, ({
"expected": allValues[0], "expected": allValues[0],
"got": lst, "got": lst,
}, "."+k)) }, "."+k))
@ -202,7 +202,7 @@ def _merge_GlyphOrders(font, lst, values_lst=None, default=None):
order = sorted(combined, key=sortKey) order = sorted(combined, key=sortKey)
# Make sure all input glyphsets were in proper order # Make sure all input glyphsets were in proper order
if not all(sorted(vs, key=sortKey) == vs for vs in lst): if not all(sorted(vs, key=sortKey) == vs for vs in lst):
raise VarLibMergeFailureInconsistentGlyphOrder(self, ({ raise InconsistentGlyphOrder(self, ({
},)) },))
del combined del combined
@ -230,7 +230,7 @@ def _Lookup_SinglePos_get_effective_value(subtables, glyph):
elif self.Format == 2: elif self.Format == 2:
return self.Value[self.Coverage.glyphs.index(glyph)] return self.Value[self.Coverage.glyphs.index(glyph)]
else: else:
raise VarLibMergeFailureUnsupportedFormat(self, ({ raise UnsupportedFormat(self, ({
"subtable": "single positioning lookup" "subtable": "single positioning lookup"
},)) },))
return None return None
@ -254,7 +254,7 @@ def _Lookup_PairPos_get_effective_value_pair(subtables, firstGlyph, secondGlyph)
klass2 = self.ClassDef2.classDefs.get(secondGlyph, 0) klass2 = self.ClassDef2.classDefs.get(secondGlyph, 0)
return self.Class1Record[klass1].Class2Record[klass2] return self.Class1Record[klass1].Class2Record[klass2]
else: else:
raise VarLibMergeFailureUnsupportedFormat(self, ({ raise UnsupportedFormat(self, ({
"subtable": "pair positioning lookup" "subtable": "pair positioning lookup"
},)) },))
return None return None
@ -263,7 +263,7 @@ def _Lookup_PairPos_get_effective_value_pair(subtables, firstGlyph, secondGlyph)
def merge(merger, self, lst): def merge(merger, self, lst):
self.ValueFormat = valueFormat = reduce(int.__or__, [l.ValueFormat for l in lst], 0) self.ValueFormat = valueFormat = reduce(int.__or__, [l.ValueFormat for l in lst], 0)
if not (len(lst) == 1 or (valueFormat & ~0xF == 0)): if not (len(lst) == 1 or (valueFormat & ~0xF == 0)):
raise VarLibMergeFailureUnsupportedFormat(self, ({ raise UnsupportedFormat(self, ({
"subtable": "single positioning lookup" "subtable": "single positioning lookup"
},)) },))
@ -552,7 +552,7 @@ def merge(merger, self, lst):
elif self.Format == 2: elif self.Format == 2:
_PairPosFormat2_merge(self, lst, merger) _PairPosFormat2_merge(self, lst, merger)
else: else:
raise VarLibMergeFailureUnsupportedFormat(self, ({ raise UnsupportedFormat(self, ({
"subtable": "pair positioning lookup" "subtable": "pair positioning lookup"
},)) },))
@ -669,28 +669,28 @@ def _MarkBasePosFormat1_merge(self, lst, merger, Mark='Mark', Base='Base'):
@AligningMerger.merger(ot.MarkBasePos) @AligningMerger.merger(ot.MarkBasePos)
def merge(merger, self, lst): def merge(merger, self, lst):
if not allEqualTo(self.Format, (l.Format for l in lst)): if not allEqualTo(self.Format, (l.Format for l in lst)):
raise VarLibMergeFailureInconsistentFormats(self, ({ raise InconsistentFormats(self, ({
"subtable": "mark-to-base positioning lookup", "subtable": "mark-to-base positioning lookup",
"expected": self.Format, "expected": self.Format,
"got": [l.Format for l in lst]},)) "got": [l.Format for l in lst]},))
if self.Format == 1: if self.Format == 1:
_MarkBasePosFormat1_merge(self, lst, merger) _MarkBasePosFormat1_merge(self, lst, merger)
else: else:
raise VarLibMergeFailureUnsupportedFormat(self, ({ raise UnsupportedFormat(self, ({
"subtable": "mark-to-base positioning lookup", "subtable": "mark-to-base positioning lookup",
})) }))
@AligningMerger.merger(ot.MarkMarkPos) @AligningMerger.merger(ot.MarkMarkPos)
def merge(merger, self, lst): def merge(merger, self, lst):
if not allEqualTo(self.Format, (l.Format for l in lst)): if not allEqualTo(self.Format, (l.Format for l in lst)):
raise VarLibMergeFailureInconsistentFormats(self, ({ raise InconsistentFormats(self, ({
"subtable": "mark-to-mark positioning lookup", "subtable": "mark-to-mark positioning lookup",
"expected": self.Format, "expected": self.Format,
"got": [l.Format for l in lst]},)) "got": [l.Format for l in lst]},))
if self.Format == 1: if self.Format == 1:
_MarkBasePosFormat1_merge(self, lst, merger, 'Mark1', 'Mark2') _MarkBasePosFormat1_merge(self, lst, merger, 'Mark1', 'Mark2')
else: else:
raise VarLibMergeFailureUnsupportedFormat(self, ({ raise UnsupportedFormat(self, ({
"subtable": "mark-to-mark positioning lookup", "subtable": "mark-to-mark positioning lookup",
})) }))
@ -822,12 +822,12 @@ def merge(merger, self, lst):
continue continue
if sts[0].__class__.__name__.startswith('Extension'): if sts[0].__class__.__name__.startswith('Extension'):
if not allEqual([st.__class__ for st in sts]): if not allEqual([st.__class__ for st in sts]):
raise VarLibMergeFailureInconsistentExtensions(self, ({ raise InconsistentExtensions(self, ({
"expected": "Extension", "expected": "Extension",
"got": [st.__class__.__name__ for st in sts] "got": [st.__class__.__name__ for st in sts]
},)) },))
if not allEqual([st.ExtensionLookupType for st in sts]): if not allEqual([st.ExtensionLookupType for st in sts]):
raise VarLibMergeFailureInconsistentExtensions(self, ({ raise InconsistentExtensions(self, ({
},)) },))
l.LookupType = sts[0].ExtensionLookupType l.LookupType = sts[0].ExtensionLookupType
new_sts = [st.ExtSubTable for st in sts] new_sts = [st.ExtSubTable for st in sts]
@ -1057,7 +1057,7 @@ class VariationMerger(AligningMerger):
if None in lst: if None in lst:
if allNone(lst): if allNone(lst):
if out is not None: if out is not None:
raise VarLibMergeFailureFoundANone(self, ({ raise FoundANone(self, ({
"got": lst "got": lst
},)) },))
return return
@ -1080,7 +1080,7 @@ def buildVarDevTable(store_builder, master_values):
@VariationMerger.merger(ot.BaseCoord) @VariationMerger.merger(ot.BaseCoord)
def merge(merger, self, lst): def merge(merger, self, lst):
if self.Format != 1: if self.Format != 1:
raise VarLibMergeFailureUnsupportedFormat(self, ({ raise UnsupportedFormat(self, ({
"subtable": "a baseline coordinate" "subtable": "a baseline coordinate"
},)) },))
self.Coordinate, DeviceTable = buildVarDevTable(merger.store_builder, [a.Coordinate for a in lst]) self.Coordinate, DeviceTable = buildVarDevTable(merger.store_builder, [a.Coordinate for a in lst])
@ -1091,7 +1091,7 @@ def merge(merger, self, lst):
@VariationMerger.merger(ot.CaretValue) @VariationMerger.merger(ot.CaretValue)
def merge(merger, self, lst): def merge(merger, self, lst):
if self.Format != 1: if self.Format != 1:
raise VarLibMergeFailureUnsupportedFormat(self, ({ raise UnsupportedFormat(self, ({
"subtable": "a caret" "subtable": "a caret"
},)) },))
self.Coordinate, DeviceTable = buildVarDevTable(merger.store_builder, [a.Coordinate for a in lst]) self.Coordinate, DeviceTable = buildVarDevTable(merger.store_builder, [a.Coordinate for a in lst])
@ -1102,7 +1102,7 @@ def merge(merger, self, lst):
@VariationMerger.merger(ot.Anchor) @VariationMerger.merger(ot.Anchor)
def merge(merger, self, lst): def merge(merger, self, lst):
if self.Format != 1: if self.Format != 1:
raise VarLibMergeFailureUnsupportedFormat(self, ({ raise UnsupportedFormat(self, ({
"subtable": "an anchor" "subtable": "an anchor"
},)) },))
self.XCoordinate, XDeviceTable = buildVarDevTable(merger.store_builder, [a.XCoordinate for a in lst]) self.XCoordinate, XDeviceTable = buildVarDevTable(merger.store_builder, [a.XCoordinate for a in lst])