Magic-Mirror/python-uncompyle6
1
0
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2024-10-07 18:23:42 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

< 2.7 bug in not distinguishing raise from assert

Browse Source
This commit is contained in:
rocky 2016-07-06 19:52:02 -04:00
parent a1dab0fa3a
commit aa65b098a4
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_2.6/04_raise.pyc Normal file
View File

Binary file not shown.

9
test/simple_source/stmts/04_raise.py Normal file
View File

@ -0,0 +1,9 @@
# 2.6.9 asynccore.py
# Bug in 2.6 was confusing AssertError with an assert statement
# There is special detect code to sort this out based on whether
# we have POP_JUMP_IF_TRUE (2.7) / JUMP_IF_TRUE, POP_TOP
def compact_traceback(tb):
if not tb: # Must have a traceback
raise AssertionError("traceback does not exist")
return

20
uncompyle6/scanners/scanner2.py
View File

@ -553,14 +553,18 @@ class Scanner2(scan.Scanner):
self.fixed_jumps[pos] = rtarget
return
# Does this jump to right after another cond jump that is
# Does this jump to right after another conditional jump that is
# not myself? If so, it's part of a larger conditional.
# rocky: if we have a conditional jump to the next instruction, then
# possibly I am "skipping over" a "pass" or null statement.
## FIXME: need to handle <2.7 which has this as two instructions.
if ( code[pre[target]] in
(self.pop_jump_if_or_pop | self.pop_jump_if)
if self.version < 2.7:
op_testset = set([self.opc.POP_TOP,
self.opc.JUMP_IF_TRUE, self.opc.JUMP_IF_FALSE])
else:
op_testset = self.pop_jump_if_or_pop | self.pop_jump_if
if ( code[pre[target]] in op_testset
and (target > pos) ):
self.fixed_jumps[pos] = pre[target]
self.structs.append({'type': 'and/or',
@ -614,10 +618,14 @@ class Scanner2(scan.Scanner):
self.fixed_jumps[pos] = match[-1]
return
else: # op == self.opc.PJIT
if (pos+3) in self.load_asserts:
if self.version < 2.7 and code[pos+3] == self.opc.POP_TOP:
assert_pos = pos + 4
else:
assert_pos = pos + 3
if (assert_pos) in self.load_asserts:
if code[pre[rtarget]] == self.opc.RAISE_VARARGS:
return
self.load_asserts.remove(pos+3)
self.load_asserts.remove(assert_pos)
next = self.next_stmt[pos]
if pre[next] == pos: