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

cff.py: don't bother cleaning privateDict if it is None

Browse Source
This commit is contained in:
Nikolaus Waxweiler 2019-08-16 22:09:52 +01:00
parent b8f5d3d705
commit c1bfc6ad4d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Lib/fontTools/varLib/cff.py
View File

@ -61,15 +61,16 @@ def lib_convertCFFToCFF2(cff, otFont):
fdArray.append(fontDict) fdArray.append(fontDict)
fontDict.Private = privateDict fontDict.Private = privateDict
privateOpOrder = buildOrder(privateDictOperators2) privateOpOrder = buildOrder(privateDictOperators2)
for entry in privateDictOperators: if privateDict is not None:
key = entry[1] for entry in privateDictOperators:
if key not in privateOpOrder: key = entry[1]
if key in privateDict.rawDict: if key not in privateOpOrder:
# print "Removing private dict", key if key in privateDict.rawDict:
del privateDict.rawDict[key] # print "Removing private dict", key
if hasattr(privateDict, key): del privateDict.rawDict[key]
delattr(privateDict, key) if hasattr(privateDict, key):
# print "Removing privateDict attr", key delattr(privateDict, key)
# print "Removing privateDict attr", key
else: else:
# clean up the PrivateDicts in the fdArray # clean up the PrivateDicts in the fdArray
fdArray = topDict.FDArray fdArray = topDict.FDArray