Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2017-10-12 07:05:34 -04:00
25 changed files with 349 additions and 22 deletions

View File

@@ -451,6 +451,19 @@ def make_function3(self, node, isLambda, nested=1, codeNode=None):
# MAKE_FUNCTION_... or MAKE_CLOSURE_...
assert node[-1].kind.startswith('MAKE_')
<<<<<<< HEAD
=======
# Python 3.3+ adds a qualified name at TOS (-1)
# moving down the LOAD_LAMBDA instruction
if 3.0 <= self.version <= 3.2:
lambda_index = -2
elif 3.03 <= self.version:
lambda_index = -3
else:
lambda_index = None
>>>>>>> master
args_node = node[-1]
if isinstance(args_node.attr, tuple):