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

Fix bug in handling 3.5- complex annotation return...

Browse Source 
Go over runtests.sh for 3.5
This commit is contained in:
rocky
2020-01-09 19:55:22 -05:00
parent fee02e0aa0
commit 8b74d8f855
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.4_run/04_def_annotate.pyc
View File

Binary file not shown.

BIN
test/bytecode_3.5_run/04_def_annotate.pyc
View File

Binary file not shown.

9
test/simple_source/bug31/04_def_annotate.py
View File

@@ -150,3 +150,12 @@ ann2(1)
assert test12(1, 2, 3, name='hi') == (1, (2, 3)), "a, *args, name" assert test12(1, 2, 3, name='hi') == (1, (2, 3)), "a, *args, name"
assert test13(1, 2, 3, name='hi') == ((1, 2, 3), 'hi'), "*args, name" assert test13(1, 2, 3, name='hi') == ((1, 2, 3), 'hi'), "*args, name"
assert test16('localhost', loop=2, limit=3, a='b') == ('localhost', None, 2, 3, {'a': 'b'}) assert test16('localhost', loop=2, limit=3, a='b') == ('localhost', None, 2, 3, {'a': 'b'})
# From test 3.5 test_pydoc.py.
# Bug was in 3.5 and earlier handling of the return type, typing.Tuple[...]
try:
import typing
def foo() -> typing.Iterator[typing.Tuple[int, typing.Any]]:
...
except:
pass

4
test/stdlib/runtests.sh
View File

@@ -290,7 +290,8 @@ case $PYVERSION in
[test_pkgimport.py]=1 # long [test_pkgimport.py]=1 # long
[test_poplib.py]=1 [test_poplib.py]=1
[test_print.py]=1 [test_print.py]=1
[test_pwd.py]=1 # Takes too long [test_pwd.py]=1 # Takes too long
[test_pydoc.py]=1 # test assertion: help text difference
[test_queue.py]=1 # Possibly parameter differences - investigate [test_queue.py]=1 # Possibly parameter differences - investigate
[test_raise.py]=1 # Test assert error [test_raise.py]=1 # Test assert error
[test_range.py]=1 # doesn't terminate [test_range.py]=1 # doesn't terminate
@@ -406,7 +407,6 @@ case $PYVERSION in
[test_poll.py]=1 # Takes too long 11 seconds [test_poll.py]=1 # Takes too long 11 seconds
[test_poplib.py]=1 [test_poplib.py]=1
[test_pulldom.py]=1 [test_pulldom.py]=1
[test_pydoc.py]=1 # uncompyle6 error - Internal Error: n_build_list expects list, tuple, set, or unpack" Investigate
[test_quopri.py]=1 # AssertionError: b'123=four' != '123=four' [test_quopri.py]=1 # AssertionError: b'123=four' != '123=four'
[test_range.py]=1 [test_range.py]=1
[test_robotparser.py]=1 [test_robotparser.py]=1

2
uncompyle6/parsers/parse3.py
View File

@@ -1086,7 +1086,7 @@ class Python3Parser(PythonParser):
load_op = "LOAD_CONST" load_op = "LOAD_CONST"
if annotate_args > 0: if annotate_args > 0:
rule = "mkfunc_annotate ::= %s%s%sannotate_tuple load_closure %s %s %s" % ( rule = "mkfunc_annotate ::= %s%s%sannotate_tuple load_closure %s %s" % (
"pos_arg " * args_pos, "pos_arg " * args_pos,
kwargs_str, kwargs_str,
"annotate_arg " * (annotate_args - 1), "annotate_arg " * (annotate_args - 1),

15
uncompyle6/semantics/make_function3.py
View File

@@ -269,12 +269,15 @@ def make_function3_annotate(
self.write("\n" + indent) self.write("\n" + indent)
line_number = self.line_number line_number = self.line_number
self.write(" -> ") self.write(" -> ")
# value, string = annotate_args['return'] if 'return' in annotate_dict:
# if string: self.write(annotate_dict['return'])
# self.write(' -> "%s"' % value) else:
# else: # value, string = annotate_args['return']
# self.write(' -> %s' % value) # if string:
self.preorder(node[annotate_last - 1]) # self.write(' -> "%s"' % value)
# else:
# self.write(' -> %s' % value)
self.preorder(node[annotate_last - 1])
self.println(":") self.println(":")