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

Merge branch 'python-3.0-to-3.2' into python-2.4

Browse Source
This commit is contained in:
rocky
2024-02-11 23:52:59 -05:00
parent c7b71b4e34 297c65d485
commit a51cd0df5d
7 changed files with 73 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
uncompyle6/bin/uncompile.py
View File

@@ -267,18 +267,18 @@ def main_bin():
tot_files = okay_files = failed_files = verify_failed_files = 0 tot_files = okay_files = failed_files = verify_failed_files = 0
def process_func(): def process_func():
(tot_files, okay_files, failed_files, verify_failed_files) = (
0,
0,
0,
0,
)
try: try:
(tot_files, okay_files, failed_files, verify_failed_files) = (
0,
0,
0,
0,
)
while 1: while 1:
f = fqueue.get() f = fqueue.get()
if f is None: if f is None:
break break
(t, o, f, v) = main(src_base, out_base, [f], [], outfile, **options) (t, o, f, v) = main(src_base, out_base, [f], [], outfile)
tot_files += t tot_files += t
okay_files += o okay_files += o
failed_files += f failed_files += f

25
uncompyle6/main.py
View File

@@ -409,25 +409,14 @@ def main(
check_type = "syntax check" check_type = "syntax check"
if do_verify == "run": if do_verify == "run":
check_type = "run" check_type = "run"
if PYTHON_VERSION_TRIPLE >= (3, 7): return_code = subprocess.call(
result = subprocess.run( [sys.executable, deparsed_object.f.name],
[sys.executable, deparsed_object.f.name], stdout=sys.stdout,
capture_output=True, stderr=sys.stderr,
) )
valid = result.returncode == 0 valid = return_code == 0
output = result.stdout.decode()
if output:
print(output)
pass
else:
result = subprocess.run(
[sys.executable, deparsed_object.f.name],
)
valid = result.returncode == 0
pass
if not valid: if not valid:
print(result.stderr.decode()) sys.stderr.write("Got return code %d\n" % return_code)
else: else:
print("Syntax checking not supported before Python 3.0") print("Syntax checking not supported before Python 3.0")
# valid = syntax_check(deparsed_object.f.name) # valid = syntax_check(deparsed_object.f.name)

61
uncompyle6/parsers/parse3.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2015-2023 Rocky Bernstein # Copyright (c) 2015-2024 Rocky Bernstein
# Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org> # Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
# Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com> # Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
# Copyright (c) 1999 John Aycock # Copyright (c) 1999 John Aycock
@@ -1204,9 +1204,24 @@ class Python3Parser(PythonParser):
) )
) )
else: else:
rule = "mkfunc ::= %s%sload_closure LOAD_CODE LOAD_STR %s" % ( if self.version == (3, 3):
kwargs_str, # 3.3 puts kwargs before pos_arg
"pos_arg " * pos_args_count, pos_kw_tuple = (
("kwargs " * kw_args_count),
("pos_arg " * pos_args_count),
)
else:
# 3.4 and 3.5 puts pos_arg before kwargs
pos_kw_tuple = (
"pos_arg " * (pos_args_count),
("kwargs " * kw_args_count),
)
rule = (
"mkfunc ::= %s%s%s " "load_closure LOAD_CODE LOAD_STR %s"
) % (
pos_kw_tuple[0],
pos_kw_tuple[1],
"annotate_tuple " * (annotate_args),
opname, opname,
) )
self.add_unique_rule(rule, opname, token.attr, customize) self.add_unique_rule(rule, opname, token.attr, customize)
@@ -1448,12 +1463,12 @@ class Python3Parser(PythonParser):
) )
self.add_unique_rule(rule, opname, token.attr, customize) self.add_unique_rule(rule, opname, token.attr, customize)
rule = ( rule = (
"mkfunc_annotate ::= %s%sannotate_tuple LOAD_CODE LOAD_STR %s" "mkfunc_annotate ::= %s%sannotate_tuple LOAD_CODE "
% ( "LOAD_STR %s"
("pos_arg " * pos_args_count), ) % (
("annotate_arg " * annotate_args), ("pos_arg " * pos_args_count),
opname, ("annotate_arg " * annotate_args),
) opname,
) )
if self.version >= (3, 3): if self.version >= (3, 3):
if self.version == (3, 3): if self.version == (3, 3):
@@ -1463,29 +1478,19 @@ class Python3Parser(PythonParser):
("pos_arg " * pos_args_count), ("pos_arg " * pos_args_count),
) )
else: else:
# 3.4 and 3.5puts pos_arg before kwargs # 3.4 and 3.5 puts pos_arg before kwargs
pos_kw_tuple = ( pos_kw_tuple = (
"pos_arg " * (pos_args_count), "pos_arg " * (pos_args_count),
("kwargs " * kw_args_count), ("kwargs " * kw_args_count),
) )
rule = ( rule = (
"mkfunc_annotate ::= %s%s%sannotate_tuple LOAD_CODE LOAD_STR %s" "mkfunc_annotate ::= %s%s%sannotate_tuple LOAD_CODE "
% ( "LOAD_STR %s"
pos_kw_tuple[0], ) % (
pos_kw_tuple[1], pos_kw_tuple[0],
("annotate_arg " * annotate_args), pos_kw_tuple[1],
opname, ("annotate_arg " * annotate_args),
) opname,
)
self.add_unique_rule(rule, opname, token.attr, customize)
rule = (
"mkfunc_annotate ::= %s%s%sannotate_tuple LOAD_CODE LOAD_STR %s"
% (
pos_kw_tuple[0],
pos_kw_tuple[1],
("annotate_arg " * annotate_args),
opname,
)
) )
else: else:
rule = ( rule = (

13
uncompyle6/scanners/scanner3.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2015-2019, 2021-2023 by Rocky Bernstein # Copyright (c) 2015-2019, 2021-2024 by Rocky Bernstein
# Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org> # Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
# Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com> # Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
# #
@@ -468,7 +468,6 @@ class Scanner3(Scanner):
last_op_was_break = False last_op_was_break = False
new_tokens = [] new_tokens = []
operand_value = 0
for i, inst in enumerate(self.insts): for i, inst in enumerate(self.insts):
opname = inst.opname opname = inst.opname
@@ -519,11 +518,9 @@ class Scanner3(Scanner):
op = inst.opcode op = inst.opcode
if opname == "EXTENDED_ARG": if opname == "EXTENDED_ARG":
if i + 1 < n: # EXTEND_ARG adjustments to the operand value should have
operand_value = argval << 16 # already been accounted for in xdis instruction creation.
continue continue
else:
operand_value = 0
if inst.offset in jump_targets: if inst.offset in jump_targets:
jump_idx = 0 jump_idx = 0
@@ -630,7 +627,7 @@ class Scanner3(Scanner):
attr = attr[:4] # remove last value: attr[5] == False attr = attr[:4] # remove last value: attr[5] == False
else: else:
pos_args, name_pair_args, annotate_args = parse_fn_counts_30_35( pos_args, name_pair_args, annotate_args = parse_fn_counts_30_35(
inst.argval + operand_value inst.argval
) )
pattr = "%s positional, %s keyword only, %s annotated" % ( pattr = "%s positional, %s keyword only, %s annotated" % (

11
uncompyle6/scanners/scanner35.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2017, 2021-2022 by Rocky Bernstein # Copyright (c) 2017, 2021-2022, 2024 by Rocky Bernstein
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -22,19 +22,22 @@ This sets up opcodes Python's 3.5 and calls a generalized
scanner routine for Python 3. scanner routine for Python 3.
""" """
from uncompyle6.scanners.scanner3 import Scanner3
# bytecode verification, verify(), uses JUMP_OPs from here # bytecode verification, verify(), uses JUMP_OPs from here
from xdis.opcodes import opcode_35 as opc from xdis.opcodes import opcode_35 as opc
from uncompyle6.scanners.scanner3 import Scanner3
JUMP_OPS = opc.JUMP_OPS JUMP_OPS = opc.JUMP_OPS
class Scanner35(Scanner3):
class Scanner35(Scanner3):
def __init__(self, show_asm=None, is_pypy=False): def __init__(self, show_asm=None, is_pypy=False):
Scanner3.__init__(self, (3, 5), show_asm, is_pypy) Scanner3.__init__(self, (3, 5), show_asm, is_pypy)
return return
pass pass
if __name__ == "__main__": if __name__ == "__main__":
from xdis.version_info import PYTHON_VERSION_TRIPLE, version_tuple_to_str from xdis.version_info import PYTHON_VERSION_TRIPLE, version_tuple_to_str

10
uncompyle6/scanners/scanner37base.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2015-2020, 2022-2023 by Rocky Bernstein # Copyright (c) 2015-2020, 2022-2024 by Rocky Bernstein
# Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org> # Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
# Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com> # Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
# #
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
Python 37 bytecode scanner/deparser base. Python 3.7 bytecode scanner/deparser base.
Also we *modify* the instruction sequence to assist deparsing code. Also we *modify* the instruction sequence to assist deparsing code.
For example: For example:
@@ -318,12 +318,6 @@ class Scanner37Base(Scanner):
argval = inst.argval argval = inst.argval
op = inst.opcode op = inst.opcode
if inst.opname == "EXTENDED_ARG":
# FIXME: The EXTENDED_ARG is used to signal annotation
# parameters
if i + 1 < n and self.insts[i + 1].opcode != self.opc.MAKE_FUNCTION:
continue
if inst.offset in jump_targets: if inst.offset in jump_targets:
jump_idx = 0 jump_idx = 0
# We want to process COME_FROMs to the same offset to be in *descending* # We want to process COME_FROMs to the same offset to be in *descending*

22
uncompyle6/semantics/make_function3.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2015-2021 by Rocky Bernstein # Copyright (c) 2015-2021, 2024 by Rocky Bernstein
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -16,17 +16,20 @@
All the crazy things we have to do to handle Python functions in 3.0-3.5 or so. All the crazy things we have to do to handle Python functions in 3.0-3.5 or so.
The saga of changes before and after is in other files. The saga of changes before and after is in other files.
""" """
from xdis import iscode, code_has_star_arg, code_has_star_star_arg, CO_GENERATOR from xdis import CO_GENERATOR, code_has_star_arg, code_has_star_star_arg, iscode
from uncompyle6.scanner import Code from uncompyle6.scanner import Code
from uncompyle6.parser import ParserError as ParserError2
from uncompyle6.parsers.treenode import SyntaxTree from uncompyle6.parsers.treenode import SyntaxTree
from uncompyle6.semantics.parser_error import ParserError from uncompyle6.semantics.parser_error import ParserError
from uncompyle6.scanner import Code
>>>>>>> python-3.0-to-3.2
from uncompyle6.semantics.helper import ( from uncompyle6.semantics.helper import (
print_docstring,
find_all_globals, find_all_globals,
find_globals_and_nonlocals, find_globals_and_nonlocals,
find_none, find_none,
print_docstring,
) )
from uncompyle6.semantics.parser_error import ParserError
from uncompyle6.show import maybe_show_tree_param_default from uncompyle6.show import maybe_show_tree_param_default
# FIXME: DRY the below code... # FIXME: DRY the below code...
@@ -41,8 +44,8 @@ def make_function3_annotate(
def build_param(ast, name, default): def build_param(ast, name, default):
"""build parameters: """build parameters:
- handle defaults - handle defaults
- handle format tuple parameters - handle format tuple parameters
""" """
if default: if default:
value = self.traverse(default, indent="") value = self.traverse(default, indent="")
@@ -302,7 +305,7 @@ def make_function3_annotate(
def make_function3(self, node, is_lambda, nested=1, code_node=None): def make_function3(self, node, is_lambda, nested=1, code_node=None):
"""Dump function definition, doc string, and function body in """Dump function definition, doc string, and function body in
Python version 3.0 and above Python version 3.0 and above
""" """
# For Python 3.3, the evaluation stack in MAKE_FUNCTION is: # For Python 3.3, the evaluation stack in MAKE_FUNCTION is:
@@ -335,8 +338,8 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
def build_param(ast, name, default, annotation=None): def build_param(ast, name, default, annotation=None):
"""build parameters: """build parameters:
- handle defaults - handle defaults
- handle format tuple parameters - handle format tuple parameters
""" """
value = self.traverse(default, indent="") value = self.traverse(default, indent="")
maybe_show_tree_param_default(self.showast, name, value) maybe_show_tree_param_default(self.showast, name, value)
@@ -421,7 +424,6 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
pass pass
if len(node) > 2 and (have_kwargs or node[lc_index].kind != "load_closure"): if len(node) > 2 and (have_kwargs or node[lc_index].kind != "load_closure"):
# Find the index in "node" where the first default # Find the index in "node" where the first default
# parameter value is located. Note this is in contrast to # parameter value is located. Note this is in contrast to
# key-word arguments, pairs of (name, value), which appear after "*". # key-word arguments, pairs of (name, value), which appear after "*".