From c01eb554ed9d7f202114f3df823556a355412347 Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 12 Jun 2018 12:35:13 -0400 Subject: [PATCH] Fix bug introduced in last commit --- README.rst | 5 ++++- uncompyle6/scanner.py | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index a9bbcc11..55904f04 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -|buildstatus| +|buildstatus| |Latest Version| |Supported Python Versions| uncompyle6 ========== @@ -234,3 +234,6 @@ See Also .. _PJOrion: http://www.koreanrandom.com/forum/topic/15280-pjorion-%D1%80%D0%B5%D0%B4%D0%B0%D0%BA%D1%82%D0%B8%D1%80%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D0%B5-%D0%BA%D0%BE%D0%BC%D0%BF%D0%B8%D0%BB%D1%8F%D1%86%D0%B8%D1%8F-%D0%B4%D0%B5%D0%BA%D0%BE%D0%BC%D0%BF%D0%B8%D0%BB%D1%8F%D1%86%D0%B8%D1%8F-%D0%BE%D0%B1%D1%84 .. _Deobfuscator: https://github.com/extremecoders-re/PjOrion-Deobfuscator .. _Py2EXE: https://en.wikipedia.org/wiki/Py2exe +.. |Supported Python Versions| image:: https://img.shields.io/pypi/pyversions/uncompyle6.svg +.. |Latest Version| image:: https://badge.fury.io/py/uncompyle6.svg + :target: https://badge.fury.io/py/uncompyle6 diff --git a/uncompyle6/scanner.py b/uncompyle6/scanner.py index 06331bdb..e55cd380 100755 --- a/uncompyle6/scanner.py +++ b/uncompyle6/scanner.py @@ -514,13 +514,15 @@ def get_scanner(version, is_pypy=False, show_asm=None): if is_pypy: exec("import uncompyle6.scanners.pypy%s as scan" % v_str, locals(), globals()) - scanner = eval("scan.ScannerPyPy%s(show_asm=show_asm)" % v_str, - locals(), globals()) else: exec("import uncompyle6.scanners.scanner%s as scan" % v_str, locals(), globals()) - scanner = eval("scan.Scanner%s(show_asm=show_asm)" % v_str, - locals(), globals()) + if is_pypy: + scanner = eval("scan.ScannerPyPy%s(show_asm=show_asm)" % v_str, + locals(), globals()) + else: + scanner = eval("scan.Scanner%s(show_asm=show_asm)" % v_str, + locals(), globals()) else: raise RuntimeError("Unsupported Python version %s" % version) return scanner