jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 09:22:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs caused by last commit

Browse Source
This commit is contained in:
rocky
2019-04-18 07:31:16 -04:00
parent b2dd58a85e
commit 8663b4ca52
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
uncompyle6/semantics/make_function.py
View File

@@ -539,7 +539,7 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
names = annotate_node[-2].attr names = annotate_node[-2].attr
l = len(types) l = len(types)
assert l == len(names) assert l == len(names)
annotate_dict = {names[i]:types[i] for i in range(l)} for i in range(l): annotate_dict[names[i]] = types[i]
pass pass
pass pass
i -= 1 i -= 1
@@ -575,22 +575,26 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
default_values_start += 1 default_values_start += 1
defparams = node[default_values_start:default_values_start+args_node.attr[0]] defparams = node[default_values_start:default_values_start+args_node.attr[0]]
else: else:
defparams = [] if self.version < 3.6:
# FIXME: DRY with code below defparams = node[:args_node.attr[0]]
default, kw_args, annotate_argc = args_node.attr[0:3] kw_args = 0
if default:
expr_node = node[0]
if node[0] == 'pos_arg':
expr_node = expr_node[0]
assert expr_node == 'expr', "expecting mkfunc default node to be an expr"
if (expr_node[0] == 'LOAD_CONST' and
isinstance(expr_node[0].attr, tuple)):
defparams = [repr(a) for a in expr_node[0].attr]
elif expr_node[0] in frozenset(('list', 'tuple', 'dict', 'set')):
defparams = [self.traverse(n, indent='') for n in expr_node[0][:-1]]
else: else:
defparams = [] defparams = []
pass # FIXME: DRY with code below
default, kw_args, annotate_argc = args_node.attr[0:3]
if default:
expr_node = node[0]
if node[0] == 'pos_arg':
expr_node = expr_node[0]
assert expr_node == 'expr', "expecting mkfunc default node to be an expr"
if (expr_node[0] == 'LOAD_CONST' and
isinstance(expr_node[0].attr, tuple)):
defparams = [repr(a) for a in expr_node[0].attr]
elif expr_node[0] in frozenset(('list', 'tuple', 'dict', 'set')):
defparams = [self.traverse(n, indent='') for n in expr_node[0][:-1]]
else:
defparams = []
pass
else: else:
if self.version < 3.6: if self.version < 3.6:
defparams = node[:args_node.attr] defparams = node[:args_node.attr]
@@ -627,7 +631,7 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
names = annotate_node[-2].attr names = annotate_node[-2].attr
l = len(types) l = len(types)
assert l == len(names) assert l == len(names)
annotate_dict = {names[i]:types[i] for i in range(l)} for i in range(l): annotate_dict[names[i]] = types[i]
pass pass
pass pass
i -= 1 i -= 1