Revert "UFOReader: have readInfo return a dict"

This reverts commit 440c71345a88f32ccad06d662fb30272f9253f07.
This commit is contained in:
Cosimo Lupo 2018-10-25 16:55:59 +01:00
parent 440c71345a
commit 78f572294f
No known key found for this signature in database
GPG Key ID: 59D54DB0C9976482

View File

@ -466,7 +466,7 @@ class UFOReader(_UFOBaseIO):
raise UFOLibError("fontinfo.plist is not properly formatted.")
return data
def readInfo(self, info=None, validate=None):
def readInfo(self, info, validate=None):
"""
Read fontinfo.plist. It requires an object that allows
setting attributes with names that follow the fontinfo.plist
@ -509,17 +509,12 @@ class UFOReader(_UFOBaseIO):
# validate data
if validate:
infoDataToSet = validateInfoVersion3Data(infoDataToSet)
if info is not None:
# populate the object
for attr, value in infoDataToSet.items():
try:
setattr(info, attr, value)
except AttributeError:
raise UFOLibError(
"The supplied info object does not support setting a "
"necessary attribute (%s)." % attr
)
return infoDataToSet
# populate the object
for attr, value in list(infoDataToSet.items()):
try:
setattr(info, attr, value)
except AttributeError:
raise UFOLibError("The supplied info object does not support setting a necessary attribute (%s)." % attr)
# kerning.plist