this fixes #1808, but I'm not sure this is the most elegant solution
This commit is contained in:
parent
874e74b834
commit
033145adf6
@ -87,6 +87,11 @@ class Merger(object):
|
||||
|
||||
def mergeThings(self, out, lst):
|
||||
try:
|
||||
if hasattr(out, "ensureDecompiled"):
|
||||
out.ensureDecompiled()
|
||||
for item in lst:
|
||||
if hasattr(item, "ensureDecompiled"):
|
||||
item.ensureDecompiled()
|
||||
assert allEqualTo(out, lst, type), (out, lst)
|
||||
mergerFunc = self.mergersFor(out).get(None, None)
|
||||
if mergerFunc is not None:
|
||||
|
Loading…
x
Reference in New Issue
Block a user