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

xdis's "exception match" is now "exception-match"

Browse Source
This commit is contained in:
rocky
2017-07-17 22:42:57 -04:00
parent 9e8e4f54c7
commit d138a01bf1
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
__pkginfo__.py
View File

@@ -40,8 +40,7 @@ entry_points = {
]} ]}
ftp_url = None ftp_url = None
install_requires = ['spark-parser >= 1.6.1, < 1.7.0', install_requires = ['spark-parser >= 1.6.1, < 1.7.0',
# 'xdis >= 3.5.1, < 3.6.0', 'six'] 'xdis >= 3.5.1, < 3.6.0', 'six']
'xdis == 3.5.0', 'six']
license = 'MIT' license = 'MIT'
mailing_list = 'python-debugger@googlegroups.com' mailing_list = 'python-debugger@googlegroups.com'
modname = 'uncompyle6' modname = 'uncompyle6'

2
uncompyle6/scanners/scanner2.py
View File

@@ -452,7 +452,7 @@ class Scanner2(Scanner):
self.not_continue.add(jmp) self.not_continue.add(jmp)
jmp = self.get_target(jmp) jmp = self.get_target(jmp)
prev_offset = self.prev[except_match] prev_offset = self.prev[except_match]
# COMPARE_OP argument should be "exception match" or 10 # COMPARE_OP argument should be "exception-match" or 10
if (self.code[prev_offset] == self.opc.COMPARE_OP and if (self.code[prev_offset] == self.opc.COMPARE_OP and
self.code[prev_offset+1] != 10): self.code[prev_offset+1] != 10):
return None return None

2
uncompyle6/scanners/scanner3.py
View File

@@ -921,7 +921,7 @@ class Scanner3(Scanner):
# except block return # except block return
jump_prev = prev_op[offset] jump_prev = prev_op[offset]
if self.is_pypy and code[jump_prev] == self.opc.COMPARE_OP: if self.is_pypy and code[jump_prev] == self.opc.COMPARE_OP:
if self.opc.cmp_op[code[jump_prev+1]] == 'exception match': if self.opc.cmp_op[code[jump_prev+1]] == 'exception-match':
return return
if self.version >= 3.5: if self.version >= 3.5:
# Python 3.5 may remove as dead code a JUMP # Python 3.5 may remove as dead code a JUMP

2
uncompyle6/scanners/scanner30.py
View File

@@ -295,7 +295,7 @@ class Scanner30(Scanner3):
# except block return # except block return
jump_prev = prev_op[offset] jump_prev = prev_op[offset]
if self.is_pypy and code[jump_prev] == self.opc.COMPARE_OP: if self.is_pypy and code[jump_prev] == self.opc.COMPARE_OP:
if self.opc.cmp_op[code[jump_prev+1]] == 'exception match': if self.opc.cmp_op[code[jump_prev+1]] == 'exception-match':
return return
if self.version >= 3.5: if self.version >= 3.5:
# Python 3.5 may remove as dead code a JUMP # Python 3.5 may remove as dead code a JUMP