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

Start slice and build list on Python3. Do sanity check on marshal load

Browse Source 
of code.
This commit is contained in:
rocky
2015-12-21 06:39:01 -05:00
parent 9cdcdfd305
commit 5dc3af3238
6 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_2.7/01-slice.pyc Normal file
View File

Binary file not shown.

BIN
test/bytecode_3.4/01-slice.pyc Normal file
View File

Binary file not shown.

4
uncompyle6/__init__.py
View File

@@ -52,8 +52,6 @@ import uncompyle6.semantics.pysource
import uncompyle6.semantics.fragments
# Conventience functions so you can say:
# from uncompyle6 import deparse_code and
# from uncompyle6 import deparse_code_fragments
# from uncompyle6 import deparse_code
deparse_code = uncompyle6.semantics.pysource.deparse_code
deparse_fragments = uncompyle6.semantics.fragments.deparse_code

9
uncompyle6/marsh.py
View File

@@ -41,12 +41,19 @@ def load_code(fp, magic_int):
"""
global internStrings
internStrings = []
seek_pos = fp.tell()
# Do a sanity check. Is this a code type?
if fp.read(1).decode('utf-8') != 'c':
raise TypeError("File %s doesn't smell like Python bytecode" % fp.name)
fp.seek(seek_pos)
return load_code_internal(fp, magic_int)
def load_code_internal(fp, magic_int, bytes_for_s=False):
global internStrings
marshalType = fp.read(1).decode('utf-8')
b1 = fp.read(1)
marshalType = b1.decode('utf-8')
if marshalType == 'c':
Code = types.CodeType

9
uncompyle6/parsers/parse2.py
View File

@@ -650,11 +650,12 @@ class Python2Parser(PythonParser):
Special handling for opcodes that take a variable number
of arguments -- we add a new rule for each:
expr ::= {expr}^n BUILD_LIST_n
expr ::= {expr}^n BUILD_TUPLE_n
build_list ::= {expr}^n BUILD_TUPLE_n
build_list ::= {expr}^n BUILD_LIST_n
unpack_list ::= UNPACK_LIST {expr}^n
unpack ::= UNPACK_TUPLE {expr}^n
unpack ::= UNPACK_SEQEUENE {expr}^n
unpack ::= UNPACK_TUPLE {expr}^n
unpack ::= UNPACK_SEQEUENCE {expr}^n
mkfunc ::= {expr}^n LOAD_CONST MAKE_FUNCTION_n
mklambda ::= {expr}^n LOAD_LAMBDA MAKE_FUNCTION_n
mkfunc ::= {expr}^n load_closure LOAD_CONST MAKE_FUNCTION_n

26
uncompyle6/parsers/parse3.py
View File

@@ -26,7 +26,6 @@ class Python3Parser(PythonParser):
def __init__(self):
self.added_rules = set()
GenericASTBuilder.__init__(self, AST, 'stmts')
self.customized = {}
self.new_rules = set()
def add_unique_rule(self, rule, opname, count, customize):
@@ -36,6 +35,7 @@ class Python3Parser(PythonParser):
self.new_rules.add(rule)
self.addRule(rule, nop_func)
customize[opname] = count
# print("XXXX" , rule)
pass
return
@@ -666,11 +666,12 @@ class Python3Parser(PythonParser):
Special handling for opcodes that take a variable number
of arguments -- we add a new rule for each:
expr ::= {expr}^n BUILD_LIST_n
expr ::= {expr}^n BUILD_TUPLE_n
build_list ::= {expr}^n BUILD_LIST_n
build_list ::= {expr}^n BUILD_TUPLE_n
unpack_list ::= UNPACK_LIST {expr}^n
unpack ::= UNPACK_TUPLE {expr}^n
unpack ::= UNPACK_SEQEUENE {expr}^n
unpack ::= UNPACK_SEQEUENCE {expr}^n
mkfunc ::= {expr}^n LOAD_CONST MAKE_FUNCTION_n
mklambda ::= {expr}^n LOAD_LAMBDA MAKE_FUNCTION_n
mkfunc ::= {expr}^n load_closure LOAD_CONST MAKE_FUNCTION_n
@@ -679,8 +680,13 @@ class Python3Parser(PythonParser):
expr ::= expr {expr}^n CALL_FUNCTION_VAR_KW_n POP_TOP
expr ::= expr {expr}^n CALL_FUNCTION_KW_n POP_TOP
"""
# from trepan.api import debug
# debug(start_opts={'startup-profile': True})
for token in tokens:
opname = token.type
opname_base = opname[:opname.rfind('_')]
if opname in ('CALL_FUNCTION', 'CALL_FUNCTION_VAR',
'CALL_FUNCTION_VAR_KW', 'CALL_FUNCTION_KW'):
# Low byte indicates number of positional paramters,
@@ -694,9 +700,15 @@ class Python3Parser(PythonParser):
+ ('kwarg ' * args_kw)
+ 'expr ' * nak + token.type)
self.add_unique_rule(rule, token.type, args_pos, customize)
elif opname.startswith('MAKE_FUNCTION_'):
# from trepan.api import debug
# debug(start_opts={'startup-profile': True})
elif opname_base in ('BUILD_LIST', 'BUILD_TUPLE', 'BUILD_SET'):
rule = 'build_list ::= ' + 'expr ' * token.attr + opname
self.add_unique_rule(rule, opname, token.attr, customize)
elif opname_base in ('UNPACK_TUPLE', 'UNPACK_SEQUENCE'):
rule = 'unpack ::= ' + opname + ' designator' * token.attr
self.add_unique_rule(rule, opname, token.attr, customize)
elif opname_base == 'UNPACK_LIST':
rule = 'unpack_list ::= ' + opname + ' designator' * token.attr
elif opname_base == ('MAKE_FUNCTION'):
self.addRule('mklambda ::= %s LOAD_LAMBDA %s' %
('expr ' * token.attr, opname), nop_func)
rule = 'mkfunc ::= %s LOAD_CONST LOAD_CONST %s' % ('expr ' * token.attr, opname)