From b8f5d3d705648a6ca698ab5a8730af5f68056a5c Mon Sep 17 00:00:00 2001 From: Nikolaus Waxweiler Date: Fri, 16 Aug 2019 22:08:35 +0100 Subject: [PATCH 1/2] argparse.ArgumentParser.error takes a str --- Lib/fontTools/varLib/instancer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/fontTools/varLib/instancer.py b/Lib/fontTools/varLib/instancer.py index fd1e82bf0..ddc5173d9 100644 --- a/Lib/fontTools/varLib/instancer.py +++ b/Lib/fontTools/varLib/instancer.py @@ -987,7 +987,7 @@ def parseArgs(args): try: axisLimits = parseLimits(options.locargs) except ValueError as e: - parser.error(e) + parser.error(str(e)) if len(axisLimits) != len(options.locargs): parser.error("Specified multiple limits for the same axis") From c1bfc6ad4d26d2908b78d87f5a2f53b14a2629d4 Mon Sep 17 00:00:00 2001 From: Nikolaus Waxweiler Date: Fri, 16 Aug 2019 22:09:52 +0100 Subject: [PATCH 2/2] cff.py: don't bother cleaning privateDict if it is None --- Lib/fontTools/varLib/cff.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Lib/fontTools/varLib/cff.py b/Lib/fontTools/varLib/cff.py index a9ac11f12..967fde7c5 100644 --- a/Lib/fontTools/varLib/cff.py +++ b/Lib/fontTools/varLib/cff.py @@ -61,15 +61,16 @@ def lib_convertCFFToCFF2(cff, otFont): fdArray.append(fontDict) fontDict.Private = privateDict privateOpOrder = buildOrder(privateDictOperators2) - for entry in privateDictOperators: - key = entry[1] - if key not in privateOpOrder: - if key in privateDict.rawDict: - # print "Removing private dict", key - del privateDict.rawDict[key] - if hasattr(privateDict, key): - delattr(privateDict, key) - # print "Removing privateDict attr", key + if privateDict is not None: + for entry in privateDictOperators: + key = entry[1] + if key not in privateOpOrder: + if key in privateDict.rawDict: + # print "Removing private dict", key + del privateDict.rawDict[key] + if hasattr(privateDict, key): + delattr(privateDict, key) + # print "Removing privateDict attr", key else: # clean up the PrivateDicts in the fdArray fdArray = topDict.FDArray