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

init: Convert existing raised exceptions to new appropriate ones

Browse Source
This commit is contained in:
Nikolaus Waxweiler 2020-02-11 13:51:07 +00:00 committed by Nikolaus Waxweiler
parent 55bfa4e076
commit 8f7a796bd3
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/fontTools/varLib/__init__.py
View File

@ -39,13 +39,11 @@ import os.path
import logging import logging
from copy import deepcopy from copy import deepcopy
from pprint import pformat from pprint import pformat
from .errors import VarLibError, VarLibValidationError
log = logging.getLogger("fontTools.varLib") log = logging.getLogger("fontTools.varLib")
class VarLibError(Exception):
pass
# #
# Creation routines # Creation routines
# #
@ -703,7 +701,7 @@ def load_designspace(designspace):
masters = ds.sources masters = ds.sources
if not masters: if not masters:
raise VarLibError("no sources found in .designspace") raise VarLibValidationError("Designspace must have at least one source.")
instances = ds.instances instances = ds.instances
standard_axis_map = OrderedDict([ standard_axis_map = OrderedDict([
@ -927,7 +925,7 @@ def _open_font(path, master_finder=lambda s: s):
elif tp in ("TTF", "OTF", "WOFF", "WOFF2"): elif tp in ("TTF", "OTF", "WOFF", "WOFF2"):
font = TTFont(master_path) font = TTFont(master_path)
else: else:
raise VarLibError("Invalid master path: %r" % master_path) raise VarLibValidationError("Invalid master path: %r" % master_path)
return font return font
@ -947,10 +945,10 @@ def load_masters(designspace, master_finder=lambda s: s):
# If a SourceDescriptor has a layer name, demand that the compiled TTFont # If a SourceDescriptor has a layer name, demand that the compiled TTFont
# be supplied by the caller. This spares us from modifying MasterFinder. # be supplied by the caller. This spares us from modifying MasterFinder.
if master.layerName and master.font is None: if master.layerName and master.font is None:
raise AttributeError( raise VarLibValidationError(
"Designspace source '%s' specified a layer name but lacks the " f"Designspace source '{master.name or '<Unknown>'}' specified a "
"required TTFont object in the 'font' attribute." "layer name but lacks the required TTFont object in the 'font' "
% (master.name or "<Unknown>") "attribute."
) )
return designspace.loadSourceFonts(_open_font, master_finder=master_finder) return designspace.loadSourceFonts(_open_font, master_finder=master_finder)

3
Tests/varLib/varLib_test.py
View File

@ -1,6 +1,7 @@
from fontTools.misc.py23 import * from fontTools.misc.py23 import *
from fontTools.ttLib import TTFont, newTable from fontTools.ttLib import TTFont, newTable
from fontTools.varLib import build, load_designspace from fontTools.varLib import build, load_designspace
from fontTools.varLib.errors import VarLibValidationError
from fontTools.varLib.mutator import instantiateVariableFont from fontTools.varLib.mutator import instantiateVariableFont
from fontTools.varLib import main as varLib_main, load_masters from fontTools.varLib import main as varLib_main, load_masters
from fontTools.varLib import set_default_weight_width_slant from fontTools.varLib import set_default_weight_width_slant
@ -744,7 +745,7 @@ def test_load_masters_layerName_without_required_font():
ds.addSource(s) ds.addSource(s)
with pytest.raises( with pytest.raises(
AttributeError, VarLibValidationError,
match="specified a layer name but lacks the required TTFont object", match="specified a layer name but lacks the required TTFont object",
): ):
load_masters(ds) load_masters(ds)