Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2018-06-12 08:31:13 -04:00
6 changed files with 23 additions and 14 deletions

View File

@@ -506,12 +506,15 @@ def get_scanner(version, is_pypy=False, show_asm=None):
if version in PYTHON_VERSIONS:
v_str = "%s" % (int(version * 10))
if PYTHON3:
import importlib
if is_pypy:
scan = importlib.import_module("uncompyle6.scanners.pypy%s" % v_str)
if version == 3.0:
import uncompyle6.scanners.scanner30 as scan
else:
scan = importlib.import_module("uncompyle6.scanners.scanner%s" % v_str)
if False: print(scan) # Avoid unused scan
import importlib
if is_pypy:
scan = importlib.import_module("uncompyle6.scanners.pypy%s" % v_str)
else:
scan = importlib.import_module("uncompyle6.scanners.scanner%s" % v_str)
if False: print(scan) # Avoid unused scan
else:
if is_pypy:
exec("import uncompyle6.scanners.pypy%s as scan" % v_str)