From 0884507c0eedb210bbe691393064083dfc1aa291 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 28 Mar 2014 15:02:40 -0700 Subject: [PATCH] [merge] Minor --- Lib/fontTools/merge.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/fontTools/merge.py b/Lib/fontTools/merge.py index 28195d1ff..5b225c713 100644 --- a/Lib/fontTools/merge.py +++ b/Lib/fontTools/merge.py @@ -83,12 +83,16 @@ def sumDicts(lst): return d def mergeObjects(lst): - lst = [item for item in lst if item is not None and item is not NotImplemented] + lst = [item for item in lst if item is not NotImplemented] if not lst: - return None # Not all can be NotImplemented + return NotImplemented + lst = [item for item in lst if item is not None] + if not lst: + return None clazz = lst[0].__class__ assert all(type(item) == clazz for item in lst), lst + logic = clazz.mergeMap returnTable = clazz() returnDict = {}