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

Handle 3.5.2..3.5.2 magic...

Browse Source 
And handle magic better overal by improved xdis use
This commit is contained in:
rocky
2018-01-18 01:15:19 -05:00
parent c24934c0c3
commit 96ddef3920
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uncompyle6/__init__.py
View File

@@ -51,7 +51,7 @@ import uncompyle6.semantics.fragments
# Export some functions # Export some functions
from uncompyle6.main import decompile_file from uncompyle6.main import decompile_file
# For compaitility # For compatibility
uncompyle_file = decompile_file uncompyle_file = decompile_file
# Conventience functions so you can say: # Conventience functions so you can say:

24
uncompyle6/scanner.py
View File

@@ -17,13 +17,21 @@ import sys
from uncompyle6 import PYTHON3, IS_PYPY from uncompyle6 import PYTHON3, IS_PYPY
from uncompyle6.scanners.tok import Token from uncompyle6.scanners.tok import Token
from xdis.bytecode import op_size from xdis.bytecode import op_size
from xdis.magics import py_str2float from xdis.magics import py_str2float, canonic_python_version
from xdis.util import code2num from xdis.util import code2num
# The byte code versions we support # The byte code versions we support.
PYTHON_VERSIONS = (1.5, # Note: these all have to be floats
PYTHON_VERSIONS = frozenset((1.5,
2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7,
3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7) 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7))
CANONIC2VERSION = {canonic_python_version[str(v)]: v for v in PYTHON_VERSIONS}
# Magic changed mid version for Python 3.5.2. Compatibility was added for
# the older 3.5 interpreter magic.
CANONIC2VERSION['3.5.2'] = 3.5
# FIXME: DRY # FIXME: DRY
if PYTHON3: if PYTHON3:
@@ -301,7 +309,13 @@ def get_scanner(version, is_pypy=False, show_asm=None):
# If version is a string, turn that into the corresponding float. # If version is a string, turn that into the corresponding float.
if isinstance(version, str): if isinstance(version, str):
version = py_str2float(version) if version not in canonic_python_version:
raise RuntimeError("Unknown Python version in xdis %s" % version)
canonic_version = canonic_python_version[version]
if canonic_version not in CANONIC2VERSION:
raise RuntimeError("Unsupported Python version %s (canonic %s)"
% (version, canonic_version))
version = CANONIC2VERSION[canonic_version]
# Pick up appropriate scanner # Pick up appropriate scanner
if version in PYTHON_VERSIONS: if version in PYTHON_VERSIONS: