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

Handle the default layer test a bit more efficiently. Caught by Lasse Fister.

Browse Source 
git-svn-id: http://svn.robofab.com/branches/ufo3k@574 b5fa9d6c-a76f-4ffd-b3cb-f825fc41095c
This commit is contained in:
Tal Leming 2012-05-11 17:53:17 +00:00
parent 89daa72612
commit 4158e6aea2
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/ufoLib/validators.py
View File

@ -479,8 +479,8 @@ def fontInfoWOFFMetadataExtensionNameValidator(value):
dictPrototype = {"text" : (basestring, True), "language" : (basestring, False), "dir" : (basestring, False), "class" : (basestring, False)}
if not genericDictValidator(value, dictPrototype):
return False
if "dir" in value and value.get("dir") not in ("ltr", "rtl"):
return False
if "dir" in value and value.get("dir") not in ("ltr", "rtl"):
return False
return True
def fontInfoWOFFMetadataExtensionValueValidator(value):
@ -490,8 +490,8 @@ def fontInfoWOFFMetadataExtensionValueValidator(value):
dictPrototype = {"text" : (basestring, True), "language" : (basestring, False), "dir" : (basestring, False), "class" : (basestring, False)}
if not genericDictValidator(value, dictPrototype):
return False
if "dir" in value and value.get("dir") not in ("ltr", "rtl"):
return False
if "dir" in value and value.get("dir") not in ("ltr", "rtl"):
return False
return True
# ----------
@ -795,7 +795,7 @@ def layerContentsValidator(value, ufoPath):
return False, "A layer has an empty name."
# default layer name
if layerName == "public.default" and directoryName != "glyphs":
return False, "The name public.default is being used by a layer that is not the default."
return False, "The name public.default is being used by a layer that is not the default."
# check usage
if layerName in usedLayerNames:
return False, "The layer name %s is used by more than one layer." % layerName
@ -806,11 +806,7 @@ def layerContentsValidator(value, ufoPath):
# store
contents[layerName] = directoryName
# missing default layer
foundDefault = False
for layerName, directory in contents.items():
if directory == "glyphs":
foundDefault = True
break
foundDefault = "glyphs" in contents.values()
if not foundDefault:
return False, "The required default glyph set is not in the UFO."
return True, None