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

Formatting in < 3.0 is different for name ops

Browse Source
This commit is contained in:
rocky
2019-06-11 14:08:50 -04:00
parent 08f23567a6
commit 002720988c
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pytest/test_token.py
View File

@@ -1,3 +1,4 @@
from uncompyle6 import PYTHON_VERSION
from uncompyle6.scanners.tok import Token from uncompyle6.scanners.tok import Token
def test_token(): def test_token():
@@ -16,7 +17,10 @@ def test_token():
# Make sure formatting of: LOAD_CONST False. We assume False is the 0th index # Make sure formatting of: LOAD_CONST False. We assume False is the 0th index
# of co_consts. # of co_consts.
t = Token('LOAD_CONST', offset=1, attr=False, pattr=False, has_arg=True) t = Token('LOAD_CONST', offset=1, attr=False, pattr=False, has_arg=True)
expect = ' 1 LOAD_CONST 0 False' if PYTHON_VERSION >= 3.0:
expect = ' 1 LOAD_CONST False'
else:
expect = ' 1 LOAD_CONST 0 False'
assert t.format() == expect assert t.format() == expect
if __name__ == '__main__': if __name__ == '__main__':

2
pytest/testdata/if-2.7.right vendored
View File

@@ -8,5 +8,5 @@
9 STORE_NAME 2 'b' 9 STORE_NAME 2 'b'
12 JUMP_FORWARD 0 'to 15' 12 JUMP_FORWARD 0 'to 15'
15_0 COME_FROM 12 '12' 15_0 COME_FROM 12 '12'
15 LOAD_CONST 0 None 15 LOAD_CONST None
18 RETURN_VALUE 18 RETURN_VALUE

6
pytest/testdata/ifelse-2.7.right vendored
View File

@@ -4,12 +4,12 @@
3 0 LOAD_NAME 0 'True' 3 0 LOAD_NAME 0 'True'
3 POP_JUMP_IF_FALSE 15 'to 15' 3 POP_JUMP_IF_FALSE 15 'to 15'
4 6 LOAD_CONST 0 1 4 6 LOAD_CONST 1
9 STORE_NAME 1 'b' 9 STORE_NAME 1 'b'
12 JUMP_FORWARD 6 'to 21' 12 JUMP_FORWARD 6 'to 21'
6 15 LOAD_CONST 1 2 6 15 LOAD_CONST 2
18 STORE_NAME 2 'd' 18 STORE_NAME 2 'd'
21_0 COME_FROM 12 '12' 21_0 COME_FROM 12 '12'
21 LOAD_CONST 2 None 21 LOAD_CONST None
24 RETURN_VALUE 24 RETURN_VALUE

3
uncompyle6/scanners/tok.py
View File

@@ -118,7 +118,8 @@ class Token():
elif self.op in self.opc.hasvargs: elif self.op in self.opc.hasvargs:
return "%s%s%s" % (prefix, offset_opname, argstr) return "%s%s%s" % (prefix, offset_opname, argstr)
elif self.op in self.opc.NAME_OPS: elif self.op in self.opc.NAME_OPS:
return "%s%s%s %s" % (prefix, offset_opname, argstr, self.attr) if self.opc.version >= 3.0:
return "%s%s%s %s" % (prefix, offset_opname, argstr, self.attr)
elif name == 'EXTENDED_ARG': elif name == 'EXTENDED_ARG':
return "%s%s%s 0x%x << %s = %s" % (prefix, offset_opname, argstr, self.attr, return "%s%s%s 0x%x << %s = %s" % (prefix, offset_opname, argstr, self.attr,
self.opc.EXTENDED_ARG_SHIFT, pattr) self.opc.EXTENDED_ARG_SHIFT, pattr)