Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2018-05-19 12:36:34 -04:00
39 changed files with 222 additions and 32 deletions

View File

@@ -42,7 +42,7 @@ def make_function3_annotate(self, node, is_lambda, nested=1,
"""
if default:
value = self.traverse(default, indent='')
maybe_show_tree_param_default(self.showast, name, value)
maybe_show_tree_param_default(self, name, value)
result = '%s=%s' % (name, value)
if result[-2:] == '= ': # default was 'LOAD_CONST None'
result += 'None'