Start supporting PyPy 3.2

Add some PyPy 2.7 and PyPy 3.2 bytecode files
2024-10-07 10:13:39 +00:00 · 2016-07-24 04:16:54 -04:00 · 2016-07-24 04:16:54 -04:00 · 21683719e1
commit 21683719e1
parent 9754d27597
52 changed files with 5 additions and 5 deletions
--- a/test/bytecode_pypy_2.6.1/00_assign.pyc
+++ b/test/bytecode_pypy_2.6.1/00_assign.pyc
--- a/test/bytecode_pypy_2.6.1/00_import.pyc
+++ b/test/bytecode_pypy_2.6.1/00_import.pyc
--- a/test/bytecode_pypy_2.6.1/00_pass.pyc
+++ b/test/bytecode_pypy_2.6.1/00_pass.pyc
--- a/test/bytecode_pypy_2.6.1/01_boolean.pyc
+++ b/test/bytecode_pypy_2.6.1/01_boolean.pyc
--- a/test/bytecode_pypy_2.6.1/01_class.pyc
+++ b/test/bytecode_pypy_2.6.1/01_class.pyc
--- a/test/bytecode_pypy_2.6.1/01_list_comprehension.pyc
+++ b/test/bytecode_pypy_2.6.1/01_list_comprehension.pyc
--- a/test/bytecode_pypy_2.6.1/01_positional.pyc
+++ b/test/bytecode_pypy_2.6.1/01_positional.pyc
--- a/test/bytecode_pypy_2.6.1/01_try_except.pyc
+++ b/test/bytecode_pypy_2.6.1/01_try_except.pyc
--- a/test/bytecode_pypy3.2/00_assign.pyc
+++ b/test/bytecode_pypy3.2/00_assign.pyc
--- a/test/bytecode_pypy3.2/00_import.pyc
+++ b/test/bytecode_pypy3.2/00_import.pyc
--- a/test/bytecode_pypy3.2/00_pass.pyc
+++ b/test/bytecode_pypy3.2/00_pass.pyc
--- a/test/bytecode_pypy3.2/01_boolean.pyc
+++ b/test/bytecode_pypy3.2/01_boolean.pyc
--- a/test/bytecode_pypy3.2/01_class.pyc
+++ b/test/bytecode_pypy3.2/01_class.pyc
--- a/test/bytecode_pypy3.2/01_fns.pyc
+++ b/test/bytecode_pypy3.2/01_fns.pyc
--- a/test/bytecode_pypy3.2/01_list_comprehension.pyc
+++ b/test/bytecode_pypy3.2/01_list_comprehension.pyc
--- a/test/bytecode_pypy3.2/01_positional.pyc
+++ b/test/bytecode_pypy3.2/01_positional.pyc
--- a/test/bytecode_pypy3.2/01_try_except.pyc
+++ b/test/bytecode_pypy3.2/01_try_except.pyc
--- a/test/bytecode_pypy3.2/02_closure.pyc
+++ b/test/bytecode_pypy3.2/02_closure.pyc
--- a/test/bytecode_pypy3.2/02_complex.pyc
+++ b/test/bytecode_pypy3.2/02_complex.pyc
--- a/test/bytecode_pypy3.2/02_def.pyc
+++ b/test/bytecode_pypy3.2/02_def.pyc
--- a/test/bytecode_pypy3.2/02_slice.pyc
+++ b/test/bytecode_pypy3.2/02_slice.pyc
--- a/test/bytecode_pypy3.2/05_3x_set_comphension.pyc
+++ b/test/bytecode_pypy3.2/05_3x_set_comphension.pyc
--- a/test/bytecode_pypy3.2/05_abc_class.pyc-notyet
+++ b/test/bytecode_pypy3.2/05_abc_class.pyc-notyet
--- a/test/bytecode_pypy3.2/05_class.pyc
+++ b/test/bytecode_pypy3.2/05_class.pyc
--- a/test/bytecode_pypy3.2/05_closure_bug.pyc
+++ b/test/bytecode_pypy3.2/05_closure_bug.pyc
--- a/test/bytecode_pypy3.2/05_const_map.pyc-notyet
+++ b/test/bytecode_pypy3.2/05_const_map.pyc-notyet
--- a/test/bytecode_pypy3.2/05_dup_top_two.pyc
+++ b/test/bytecode_pypy3.2/05_dup_top_two.pyc
--- a/test/bytecode_pypy3.2/05_for_for.pyc
+++ b/test/bytecode_pypy3.2/05_for_for.pyc
--- a/test/bytecode_pypy3.2/05_for_try_except.pyc
+++ b/test/bytecode_pypy3.2/05_for_try_except.pyc
--- a/test/bytecode_pypy3.2/05_if.pyc
+++ b/test/bytecode_pypy3.2/05_if.pyc
--- a/test/bytecode_pypy3.2/05_if_assign.pyc
+++ b/test/bytecode_pypy3.2/05_if_assign.pyc
--- a/test/bytecode_pypy3.2/05_ifelse.pyc
+++ b/test/bytecode_pypy3.2/05_ifelse.pyc
--- a/test/bytecode_pypy3.2/05_list_comprehension.pyc
+++ b/test/bytecode_pypy3.2/05_list_comprehension.pyc
--- a/test/bytecode_pypy3.2/05_long_list.pyc
+++ b/test/bytecode_pypy3.2/05_long_list.pyc
--- a/test/bytecode_pypy3.2/05_set_comprehension.pyc
+++ b/test/bytecode_pypy3.2/05_set_comprehension.pyc
--- a/test/bytecode_pypy3.2/05_static_method.pyc
+++ b/test/bytecode_pypy3.2/05_static_method.pyc
--- a/test/bytecode_pypy3.2/05_store_locals.pyc
+++ b/test/bytecode_pypy3.2/05_store_locals.pyc
--- a/test/bytecode_pypy3.2/05_try_except.pyc
+++ b/test/bytecode_pypy3.2/05_try_except.pyc
--- a/test/bytecode_pypy3.2/05_try_finally_pass.pyc
+++ b/test/bytecode_pypy3.2/05_try_finally_pass.pyc
--- a/test/bytecode_pypy3.2/05_with.pyc
+++ b/test/bytecode_pypy3.2/05_with.pyc
--- a/test/bytecode_pypy3.2/06_classbug.pyc
+++ b/test/bytecode_pypy3.2/06_classbug.pyc
--- a/test/bytecode_pypy3.2/06_for_break.pyc
+++ b/test/bytecode_pypy3.2/06_for_break.pyc
--- a/test/bytecode_pypy3.2/06_frozenset.pyc
+++ b/test/bytecode_pypy3.2/06_frozenset.pyc
--- a/test/bytecode_pypy3.2/06_ifTrue_optimize_bug.pyc
+++ b/test/bytecode_pypy3.2/06_ifTrue_optimize_bug.pyc
--- a/test/bytecode_pypy3.2/06_list_ifnot.pyc
+++ b/test/bytecode_pypy3.2/06_list_ifnot.pyc
--- a/test/bytecode_pypy3.2/06_list_ifnot_and.pyc-notyet
+++ b/test/bytecode_pypy3.2/06_list_ifnot_and.pyc-notyet
--- a/test/bytecode_pypy3.2/06_return_bug.pyc
+++ b/test/bytecode_pypy3.2/06_return_bug.pyc
--- a/test/bytecode_pypy3.2/06_setif_comprehension.pyc-notyet
+++ b/test/bytecode_pypy3.2/06_setif_comprehension.pyc-notyet
--- a/test/bytecode_pypy3.2/06_tryifelse.pyc-notyet
+++ b/test/bytecode_pypy3.2/06_tryifelse.pyc-notyet
--- a/uncompyle6/scanner.py
+++ b/uncompyle6/scanner.py
@ -53,7 +53,7 @@ class Scanner(object):
        self.show_asm = show_asm
        if version in PYTHON_VERSIONS:
-            if is_pypy:
+            if is_pypy and version != 3.2:
                v_str = "opcode_pypy%s" % (int(version * 10))
            else:
                v_str = "opcode_%s" % (int(version * 10))
--- a/uncompyle6/scanners/scanner3.py
+++ b/uncompyle6/scanners/scanner3.py
@ -46,8 +46,8 @@ import uncompyle6.scanner as scan
 class Scanner3(scan.Scanner):
-    def __init__(self, version, show_asm=None):
+    def __init__(self, version, show_asm=None, is_pypy=False):
-        super(Scanner3, self).__init__(version, show_asm)
+        super(Scanner3, self).__init__(version, show_asm, is_pypy)
        # Create opcode classification sets
        # Note: super initilization above initializes self.opc
--- a/uncompyle6/scanners/scanner32.py
+++ b/uncompyle6/scanners/scanner32.py
@ -15,8 +15,8 @@ JUMP_OPs = map(lambda op: opc.opname[op], opc.hasjrel + opc.hasjabs)
 from uncompyle6.scanners.scanner3 import Scanner3
 class Scanner32(Scanner3):
-    def __init__(self, show_asm=None):
+    def __init__(self, show_asm=None, is_pypy=False):
-        Scanner3.__init__(self, 3.2, show_asm)
+        Scanner3.__init__(self, 3.2, show_asm, is_pypy)
        return
    pass