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

<= 2.6 weird jump out of try block

Browse Source 
Allow COME_FROMs to appare via JUMP_FORWARD in
tey/except blocks
This commit is contained in:
rocky
2016-06-30 06:21:13 -04:00
parent 7772243ac7
commit da9aeecc60
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_2.6/07_try_pass.pyc Normal file
View File

Binary file not shown.

9
test/simple_source/exception/07_try_pass.py Normal file
View File

@@ -0,0 +1,9 @@
# 2.6.9 cgi.py
# Bug in 2.6.9 was not detecting jump out of except from ValueError
def __getitem__(v):
if v:
try: return v
except ValueError:
try: return v
except ValueError: pass
return v

8
uncompyle6/scanners/scanner2.py
View File

@@ -502,10 +502,14 @@ class Scanner2(scan.Scanner):
'end': jmp+1}) 'end': jmp+1})
i = jmp + 1 i = jmp + 1
else: else:
if self.get_target(jmp) != start_else: target = self.get_target(jmp)
if target != start_else:
end_else = self.get_target(jmp) end_else = self.get_target(jmp)
if self.code[jmp] == self.opc.JF: if self.code[jmp] == self.opc.JF:
self.fixed_jumps[jmp] = -1 if self.version <= 2.6:
self.fixed_jumps[jmp] = target
else:
self.fixed_jumps[jmp] = -1
self.structs.append({'type': 'except', self.structs.append({'type': 'except',
'start': i, 'start': i,
'end': jmp}) 'end': jmp})