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

Lint some files

Browse Source
This commit is contained in:
rocky
2023-05-29 11:00:44 -04:00
parent ebcc12e2c3
commit 41d26bde79
5 changed files with 162 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
uncompyle6/bin/pydisassemble.py
View File

@@ -1,10 +1,13 @@
#!/usr/bin/env python #!/usr/bin/env python
# Mode: -*- python -*- # Mode: -*- python -*-
# #
# Copyright (c) 2015-2016, 2018, 2020, 2022 by Rocky Bernstein <rb@dustyfeet.com> # Copyright (c) 2015-2016, 2018, 2020, 2022-2023 by Rocky Bernstein <rb@dustyfeet.com>
# #
from __future__ import print_function from __future__ import print_function
import sys, os, getopt
import getopt
import os
import sys
from uncompyle6.code_fns import disassemble_file from uncompyle6.code_fns import disassemble_file
from uncompyle6.version import __version__ from uncompyle6.version import __version__
@@ -40,13 +43,19 @@ Options:
-V | --version show version and stop -V | --version show version and stop
-h | --help show this message -h | --help show this message
""".format(program) """.format(
program
)
PATTERNS = ("*.pyc", "*.pyo")
PATTERNS = ('*.pyc', '*.pyo')
def main(): def main():
Usage_short = """usage: %s FILE... Usage_short = (
Type -h for for full help.""" % program """usage: %s FILE...
Type -h for for full help."""
% program
)
if len(sys.argv) == 1: if len(sys.argv) == 1:
print("No file(s) given", file=sys.stderr) print("No file(s) given", file=sys.stderr)
@@ -54,17 +63,18 @@ Type -h for for full help.""" % program
sys.exit(1) sys.exit(1)
try: try:
opts, files = getopt.getopt(sys.argv[1:], 'hVU', opts, files = getopt.getopt(
['help', 'version', 'uncompyle6']) sys.argv[1:], "hVU", ["help", "version", "uncompyle6"]
)
except getopt.GetoptError as e: except getopt.GetoptError as e:
print('%s: %s' % (os.path.basename(sys.argv[0]), e), file=sys.stderr) print("%s: %s" % (os.path.basename(sys.argv[0]), e), file=sys.stderr)
sys.exit(-1) sys.exit(-1)
for opt, val in opts: for opt, val in opts:
if opt in ('-h', '--help'): if opt in ("-h", "--help"):
print(__doc__) print(__doc__)
sys.exit(1) sys.exit(1)
elif opt in ('-V', '--version'): elif opt in ("-V", "--version"):
print("%s %s" % (program, __version__)) print("%s %s" % (program, __version__))
sys.exit(0) sys.exit(0)
else: else:
@@ -76,11 +86,11 @@ Type -h for for full help.""" % program
if os.path.exists(files[0]): if os.path.exists(files[0]):
disassemble_file(file, sys.stdout) disassemble_file(file, sys.stdout)
else: else:
print("Can't read %s - skipping" % files[0], print("Can't read %s - skipping" % files[0], file=sys.stderr)
file=sys.stderr)
pass pass
pass pass
return return
if __name__ == '__main__':
if __name__ == "__main__":
main() main()

193
uncompyle6/bin/uncompile.py
View File

@@ -1,14 +1,19 @@
#!/usr/bin/env python #!/usr/bin/env python
# Mode: -*- python -*- # Mode: -*- python -*-
# #
# Copyright (c) 2015-2017, 2019-2020 by Rocky Bernstein # Copyright (c) 2015-2017, 2019-2020, 2023 by Rocky Bernstein
# Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com> # Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
# #
from __future__ import print_function from __future__ import print_function
import sys, os, getopt, time
import getopt
import os
import sys
import time
from xdis.version_info import version_tuple_to_str from xdis.version_info import version_tuple_to_str
program = 'uncompyle6' program = "uncompyle6"
__doc__ = """ __doc__ = """
Usage: Usage:
@@ -58,101 +63,120 @@ Extensions of generated files:
'.pyc_dis' '.pyo_dis' successfully decompiled (and verified if --verify) '.pyc_dis' '.pyo_dis' successfully decompiled (and verified if --verify)
+ '_unverified' successfully decompile but --verify failed + '_unverified' successfully decompile but --verify failed
+ '_failed' decompile failed (contact author for enhancement) + '_failed' decompile failed (contact author for enhancement)
""" % ((program,) * 5) """ % (
(program,) * 5
)
program = 'uncompyle6' program = "uncompyle6"
from uncompyle6 import verify from uncompyle6 import verify
from uncompyle6.main import main, status_msg from uncompyle6.main import main, status_msg
from uncompyle6.version import __version__ from uncompyle6.version import __version__
def usage(): def usage():
print(__doc__) print(__doc__)
sys.exit(1) sys.exit(1)
def main_bin(): def main_bin():
if not (sys.version_info[0:2] in ((2, 6), (2, 7), (3, 0), if not (
(3, 1), (3, 2), (3, 3), sys.version_info[0:2]
(3, 4), (3, 5), (3, 6), in (
(3, 7), (3, 8), (3, 9), (3, 10) (2, 6),
)): (2, 7),
(3, 0),
(3, 1),
(3, 2),
(3, 3),
(3, 4),
(3, 5),
(3, 6),
(3, 7),
(3, 8),
(3, 9),
(3, 10),
)
):
print( print(
f"Error: {program} can decompile only bytecode from Python 3.7" f"Error: {program} can decompile only bytecode from Python 3.7"
f""" to 3.8.\n\tYou have version: {version_tuple_to_str()}.""" f""" to 3.8.\n\tYou have version: {version_tuple_to_str()}."""
) )
sys.exit(-1) sys.exit(-1)
do_verify = recurse_dirs = False recurse_dirs = False
numproc = 0 numproc = 0
outfile = '-' outfile = "-"
out_base = None out_base = None
source_paths = [] source_paths = []
timestamp = False timestamp = False
timestampfmt = "# %Y.%m.%d %H:%M:%S %Z" timestampfmt = "# %Y.%m.%d %H:%M:%S %Z"
try: try:
opts, pyc_paths = getopt.getopt(sys.argv[1:], 'hac:gtTdrVo:p:', opts, pyc_paths = getopt.getopt(
'help asm compile= grammar linemaps recurse ' sys.argv[1:],
'timestamp tree= tree+ ' "hac:gtTdrVo:p:",
'fragments verify verify-run version ' "help asm compile= grammar linemaps recurse "
'syntax-verify ' "timestamp tree= tree+ "
'showgrammar encoding='.split(' ')) "fragments verify verify-run version "
"syntax-verify "
"showgrammar encoding=".split(" "),
)
except getopt.GetoptError as e: except getopt.GetoptError as e:
print('%s: %s' % (os.path.basename(sys.argv[0]), e), file=sys.stderr) print("%s: %s" % (os.path.basename(sys.argv[0]), e), file=sys.stderr)
sys.exit(-1) sys.exit(-1)
options = {} options = {}
for opt, val in opts: for opt, val in opts:
if opt in ('-h', '--help'): if opt in ("-h", "--help"):
print(__doc__) print(__doc__)
sys.exit(0) sys.exit(0)
elif opt in ('-V', '--version'): elif opt in ("-V", "--version"):
print("%s %s" % (program, __version__)) print("%s %s" % (program, __version__))
sys.exit(0) sys.exit(0)
elif opt == '--verify': elif opt == "--verify":
options['do_verify'] = 'strong' options["do_verify"] = "strong"
elif opt == '--syntax-verify': elif opt == "--syntax-verify":
options['do_verify'] = 'weak' options["do_verify"] = "weak"
elif opt == '--fragments': elif opt == "--fragments":
options['do_fragments'] = True options["do_fragments"] = True
elif opt == '--verify-run': elif opt == "--verify-run":
options['do_verify'] = 'verify-run' options["do_verify"] = "verify-run"
elif opt == '--linemaps': elif opt == "--linemaps":
options['do_linemaps'] = True options["do_linemaps"] = True
elif opt in ('--asm', '-a'): elif opt in ("--asm", "-a"):
options['showasm'] = 'after' options["showasm"] = "after"
options['do_verify'] = None options["do_verify"] = None
elif opt in ('--tree', '-t'): elif opt in ("--tree", "-t"):
if 'showast' not in options: if "showast" not in options:
options['showast'] = {} options["showast"] = {}
if val == 'before': if val == "before":
options['showast'][val] = True options["showast"][val] = True
elif val == 'after': elif val == "after":
options['showast'][val] = True options["showast"][val] = True
else: else:
options['showast']['before'] = True options["showast"]["before"] = True
options['do_verify'] = None options["do_verify"] = None
elif opt in ('--tree+', '-T'): elif opt in ("--tree+", "-T"):
if 'showast' not in options: if "showast" not in options:
options['showast'] = {} options["showast"] = {}
options['showast']['after'] = True options["showast"]["after"] = True
options['showast']['before'] = True options["showast"]["before"] = True
options['do_verify'] = None options["do_verify"] = None
elif opt in ('--grammar', '-g'): elif opt in ("--grammar", "-g"):
options['showgrammar'] = True options["showgrammar"] = True
elif opt == '-o': elif opt == "-o":
outfile = val outfile = val
elif opt in ('--timestamp', '-d'): elif opt in ("--timestamp", "-d"):
timestamp = True timestamp = True
elif opt in ('--compile', '-c'): elif opt in ("--compile", "-c"):
source_paths.append(val) source_paths.append(val)
elif opt == '-p': elif opt == "-p":
numproc = int(val) numproc = int(val)
elif opt in ('--recurse', '-r'): elif opt in ("--recurse", "-r"):
recurse_dirs = True recurse_dirs = True
elif opt == '--encoding': elif opt == "--encoding":
options['source_encoding'] = val options["source_encoding"] = val
else: else:
print(opt, file=sys.stderr) print(opt, file=sys.stderr)
usage() usage()
@@ -164,7 +188,7 @@ def main_bin():
if os.path.isdir(f): if os.path.isdir(f):
for root, _, dir_files in os.walk(f): for root, _, dir_files in os.walk(f):
for df in dir_files: for df in dir_files:
if df.endswith('.pyc') or df.endswith('.pyo'): if df.endswith(".pyc") or df.endswith(".pyo"):
expanded_files.append(os.path.join(root, df)) expanded_files.append(os.path.join(root, df))
pyc_paths = expanded_files pyc_paths = expanded_files
@@ -175,36 +199,39 @@ def main_bin():
if src_base[-1:] != os.sep: if src_base[-1:] != os.sep:
src_base = os.path.dirname(src_base) src_base = os.path.dirname(src_base)
if src_base: if src_base:
sb_len = len( os.path.join(src_base, '') ) sb_len = len(os.path.join(src_base, ""))
pyc_paths = [f[sb_len:] for f in pyc_paths] pyc_paths = [f[sb_len:] for f in pyc_paths]
if not pyc_paths and not source_paths: if not pyc_paths and not source_paths:
print("No input files given to decompile", file=sys.stderr) print("No input files given to decompile", file=sys.stderr)
usage() usage()
if outfile == '-': if outfile == "-":
outfile = None # use stdout outfile = None # use stdout
elif outfile and os.path.isdir(outfile): elif outfile and os.path.isdir(outfile):
out_base = outfile; outfile = None out_base = outfile
outfile = None
elif outfile and len(pyc_paths) > 1: elif outfile and len(pyc_paths) > 1:
out_base = outfile; outfile = None out_base = outfile
outfile = None
if timestamp: if timestamp:
print(time.strftime(timestampfmt)) print(time.strftime(timestampfmt))
if numproc <= 1: if numproc <= 1:
try: try:
result = main(src_base, out_base, pyc_paths, source_paths, outfile, result = main(
**options) src_base, out_base, pyc_paths, source_paths, outfile, **options
result = [options.get('do_verify', None)] + list(result) )
result = [options.get("do_verify", None)] + list(result)
if len(pyc_paths) > 1: if len(pyc_paths) > 1:
mess = status_msg(*result) mess = status_msg(*result)
print('# ' + mess) print("# " + mess)
pass pass
except ImportError as e: except ImportError as e:
print(str(e)) print(str(e))
sys.exit(2) sys.exit(2)
except (KeyboardInterrupt): except KeyboardInterrupt:
pass pass
except verify.VerifyCmpError: except verify.VerifyCmpError:
raise raise
@@ -216,7 +243,7 @@ def main_bin():
except ImportError: except ImportError:
from queue import Empty from queue import Empty
fqueue = Queue(len(pyc_paths)+numproc) fqueue = Queue(len(pyc_paths) + numproc)
for f in pyc_paths: for f in pyc_paths:
fqueue.put(f) fqueue.put(f)
for i in range(numproc): for i in range(numproc):
@@ -226,13 +253,17 @@ def main_bin():
def process_func(): def process_func():
try: try:
(tot_files, okay_files, failed_files, verify_failed_files) = (0, 0, 0, 0) (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) = \ (t, o, f, v) = main(src_base, out_base, [f], [], outfile, **options)
main(src_base, out_base, [f], [], outfile, **options)
tot_files += t tot_files += t
okay_files += o okay_files += o
failed_files += f failed_files += f
@@ -249,7 +280,12 @@ def main_bin():
for p in procs: for p in procs:
p.join() p.join()
try: try:
(tot_files, okay_files, failed_files, verify_failed_files) = (0, 0, 0, 0) (tot_files, okay_files, failed_files, verify_failed_files) = (
0,
0,
0,
0,
)
while True: while True:
(t, o, f, v) = rqueue.get(False) (t, o, f, v) = rqueue.get(False)
tot_files += t tot_files += t
@@ -258,8 +294,10 @@ def main_bin():
verify_failed_files += v verify_failed_files += v
except Empty: except Empty:
pass pass
print('# decompiled %i files: %i okay, %i failed, %i verify failed' % print(
(tot_files, okay_files, failed_files, verify_failed_files)) "# decompiled %i files: %i okay, %i failed, %i verify failed"
% (tot_files, okay_files, failed_files, verify_failed_files)
)
except (KeyboardInterrupt, OSError): except (KeyboardInterrupt, OSError):
pass pass
@@ -268,5 +306,6 @@ def main_bin():
return return
if __name__ == '__main__':
if __name__ == "__main__":
main_bin() main_bin()

31
uncompyle6/main.py
View File

@@ -1,4 +1,4 @@
# Copyright (C) 2018-2022 Rocky Bernstein <rocky@gnu.org> # Copyright (C) 2018-2023 Rocky Bernstein <rocky@gnu.org>
# #
# 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
@@ -13,24 +13,26 @@
# 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/>.
import datetime
import os
import py_compile
import sys
from typing import Any, Tuple from typing import Any, Tuple
import datetime, py_compile, os, sys
from xdis import iscode from xdis import iscode
from xdis.load import load_module
from xdis.version_info import IS_PYPY, PYTHON_VERSION_TRIPLE, version_tuple_to_str from xdis.version_info import IS_PYPY, PYTHON_VERSION_TRIPLE, version_tuple_to_str
from uncompyle6.code_fns import check_object_path from uncompyle6.code_fns import check_object_path
from uncompyle6.semantics import pysource
from uncompyle6.semantics.pysource import PARSER_DEFAULT_DEBUG
from uncompyle6.parser import ParserError from uncompyle6.parser import ParserError
from uncompyle6.semantics import pysource
from uncompyle6.semantics.fragments import code_deparse as code_deparse_fragments
from uncompyle6.semantics.linemap import deparse_code_with_map
from uncompyle6.semantics.pysource import PARSER_DEFAULT_DEBUG, code_deparse
from uncompyle6.version import __version__ from uncompyle6.version import __version__
# from uncompyle6.linenumbers import line_number_mapping # from uncompyle6.linenumbers import line_number_mapping
from uncompyle6.semantics.pysource import code_deparse
from uncompyle6.semantics.fragments import code_deparse as code_deparse_fragments
from uncompyle6.semantics.linemap import deparse_code_with_map
from xdis.load import load_module
def _get_outstream(outfile: str) -> Any: def _get_outstream(outfile: str) -> Any:
dir = os.path.dirname(outfile) dir = os.path.dirname(outfile)
@@ -55,7 +57,7 @@ def decompile(
source_encoding=None, source_encoding=None,
code_objects={}, code_objects={},
source_size=None, source_size=None,
is_pypy=None, is_pypy=False,
magic_int=None, magic_int=None,
mapstream=None, mapstream=None,
do_fragments=False, do_fragments=False,
@@ -145,8 +147,8 @@ def decompile(
out, out,
bytecode_version, bytecode_version,
debug_opts=debug_opts, debug_opts=debug_opts,
is_pypy=is_pypy,
compile_mode=compile_mode, compile_mode=compile_mode,
is_pypy=is_pypy,
) )
pass pass
return deparsed return deparsed
@@ -188,7 +190,7 @@ def decompile_file(
filename = check_object_path(filename) filename = check_object_path(filename)
code_objects = {} code_objects = {}
(version, timestamp, magic_int, co, is_pypy, source_size, sip_hash) = load_module( version, timestamp, magic_int, co, is_pypy, source_size, _ = load_module(
filename, code_objects filename, code_objects
) )
@@ -394,14 +396,14 @@ def main(
try: try:
# FIXME: Something is weird with Pypy here # FIXME: Something is weird with Pypy here
sys.stdout.flush() sys.stdout.flush()
except: except Exception:
pass pass
if current_outfile: if current_outfile:
sys.stdout.write("\n") sys.stdout.write("\n")
try: try:
# FIXME: Something is weird with Pypy here # FIXME: Something is weird with Pypy here
sys.stdout.flush() sys.stdout.flush()
except: except Exception:
pass pass
pass pass
return (tot_files, okay_files, failed_files, verify_failed_files) return (tot_files, okay_files, failed_files, verify_failed_files)
@@ -417,7 +419,6 @@ if sys.platform.startswith("linux") and os.uname()[2][:2] in ["2.", "3.", "4."]:
mi.close() mi.close()
return int(mu) / 1000000 return int(mu) / 1000000
else: else:
def __memUsage(): def __memUsage():

10
uncompyle6/parsers/parse13.py
View File

@@ -1,11 +1,12 @@
# Copyright (c) 2018 Rocky Bernstein # Copyright (c) 2018, 2023 Rocky Bernstein
from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
from uncompyle6.parser import PythonParserSingle from uncompyle6.parser import PythonParserSingle
from uncompyle6.parsers.parse14 import Python14Parser from uncompyle6.parsers.parse14 import Python14Parser
class Python13Parser(Python14Parser):
class Python13Parser(Python14Parser):
def p_misc13(self, args): def p_misc13(self, args):
""" """
# Nothing here yet, but will need to add LOAD_GLOBALS # Nothing here yet, but will need to add LOAD_GLOBALS
@@ -24,7 +25,6 @@ class Python13Parser(Python14Parser):
# """) # """)
# self.check_reduce['doc_junk'] = 'tokens' # self.check_reduce['doc_junk'] = 'tokens'
# def reduce_is_invalid(self, rule, ast, tokens, first, last): # def reduce_is_invalid(self, rule, ast, tokens, first, last):
# invalid = super(Python14Parser, # invalid = super(Python14Parser,
# self).reduce_is_invalid(rule, ast, # self).reduce_is_invalid(rule, ast,
@@ -35,11 +35,11 @@ class Python13Parser(Python14Parser):
# return not isinstance(tokens[first].pattr, str) # return not isinstance(tokens[first].pattr, str)
class Python13ParserSingle(Python13Parser, PythonParserSingle): class Python13ParserSingle(Python13Parser, PythonParserSingle):
pass pass
if __name__ == '__main__':
if __name__ == "__main__":
# Check grammar # Check grammar
p = Python13Parser() p = Python13Parser()
p.check_grammar() p.check_grammar()

2
uncompyle6/verify.py
View File

@@ -411,7 +411,7 @@ def cmp_code_objects(version, is_pypy, code_obj1, code_obj2, verify, name=""):
check_jumps[dest1].append((i1, i2, dest2)) check_jumps[dest1].append((i1, i2, dest2))
else: else:
check_jumps[dest1] = [(i1, i2, dest2)] check_jumps[dest1] = [(i1, i2, dest2)]
except: except Exception:
pass pass
i1 += 1 i1 += 1