Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2017-12-05 00:13:59 -05:00
5 changed files with 35 additions and 7 deletions

View File

@@ -488,7 +488,7 @@ def make_function3(self, node, is_lambda, nested=1, codeNode=None):
if (expr_node[0] == 'LOAD_CONST' and
isinstance(expr_node[0].attr, tuple)):
defparams = list(expr_node[0].attr)
elif expr_node[0] == 'list':
elif expr_node[0] in frozenset(('list', 'tuple', 'dict', 'set')):
defparams = [self.traverse(n, indent='') for n in expr_node[0][:-1]]
else:
defparams = []