Fix Python 1.5 bytecode deparse

Need xdis 3.0.2 though since the bug is really there.
2025-08-03 00:45:53 +08:00 · 2016-10-11 02:39:09 -04:00
parent bb8d0a6389
commit 9ef670c872
61 changed files with 13 additions and 10 deletions
--- a/pkginfo.py
+++ b/pkginfo.py
@@ -38,7 +38,7 @@ entry_points={
    ]}
 ftp_url            = None
 install_requires   = ['spark-parser >= 1.4.0',
-                      'xdis >= 3.0.1']
+                      'xdis >= 3.0.2']
 license            = 'MIT'
 mailing_list       = 'python-debugger@googlegroups.com'
 modname            = 'uncompyle6'
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 spark-parser >= 1.4.0
-xdis >= 3.0.1
+xdis >= 3.0.2
--- a/test/Makefile
+++ b/test/Makefile
@@ -20,7 +20,7 @@ check:
 	$(MAKE) check-$$PYTHON_VERSION

 #: Run working tests from Python 2.6 or 2.7
-check-2.6 check-2.7: check-bytecode-2 check-bytecode-3  check-2.7-ok
+check-2.6 check-2.7: check-bytecode-2 check-bytecode-3 check-bytecode-1  check-2.7-ok

 #: Run working tests from Python 3.1
 check-3.1: check-bytecode
@@ -50,6 +50,10 @@ check-3.6: check-bytecode
 check-disasm:
 	$(PYTHON) dis-compare.py

+#: Check deparsing bytecode 1.x only
+check-bytecode-1:
+	$(PYTHON) test_pythonlib.py --bytecode-1.5
+
 #: Check deparsing bytecode 2.x only
 check-bytecode-2:
 	$(PYTHON) test_pythonlib.py \
@@ -65,7 +69,9 @@ check-bytecode-3:
 check-bytecode: check-bytecode-3
 	$(PYTHON) test_pythonlib.py \
 	--bytecode-2.1 --bytecode-2.2 --bytecode-2.3 --bytecode-2.4 \
-        --bytecode-2.5 --bytecode-2.6 --bytecode-2.7 --bytecode-pypy2.7
+        --bytecode-2.5 --bytecode-2.6 --bytecode-2.7 \
+        --bytecode-pypy2.7 --bytecode-1
+

 #: Check deparsing Python 2.1
 check-bytecode-2.1:
--- a/test/bytecode_1.5/docstring.pyc
+++ b/test/bytecode_1.5/docstring.pyc
--- a/test/bytecode_1.5/exceptions.pyc
+++ b/test/bytecode_1.5/exceptions.pyc
--- a/test/bytecode_1.5/exec.pyc
+++ b/test/bytecode_1.5/exec.pyc
--- a/test/bytecode_1.5/expressions.pyc
+++ b/test/bytecode_1.5/expressions.pyc
--- a/test/bytecode_1.5/globals.pyc
+++ b/test/bytecode_1.5/globals.pyc
--- a/test/bytecode_1.5/import.pyc
+++ b/test/bytecode_1.5/import.pyc
--- a/test/bytecode_1.5/lambda.pyc
+++ b/test/bytecode_1.5/lambda.pyc
--- a/test/bytecode_1.5/misc.pyc
+++ b/test/bytecode_1.5/misc.pyc
--- a/test/bytecode_1.5/nested_elif.pyc
+++ b/test/bytecode_1.5/nested_elif.pyc
--- a/test/bytecode_1.5/print.pyc
+++ b/test/bytecode_1.5/print.pyc
--- a/test/bytecode_1.5/slices.pyc
+++ b/test/bytecode_1.5/slices.pyc
--- a/test/bytecode_1.5/test_class.pyc
+++ b/test/bytecode_1.5/test_class.pyc
--- a/test/bytecode_1.5/test_class.pyo
+++ b/test/bytecode_1.5/test_class.pyo
--- a/test/bytecode_1.5/test_del.pyc
+++ b/test/bytecode_1.5/test_del.pyc
--- a/test/bytecode_1.5/test_del.pyo
+++ b/test/bytecode_1.5/test_del.pyo
--- a/test/bytecode_1.5/test_docstring.pyc
+++ b/test/bytecode_1.5/test_docstring.pyc
--- a/test/bytecode_1.5/test_docstring.pyo
+++ b/test/bytecode_1.5/test_docstring.pyo
--- a/test/bytecode_1.5/test_empty.pyc
+++ b/test/bytecode_1.5/test_empty.pyc
--- a/test/bytecode_1.5/test_empty.pyo
+++ b/test/bytecode_1.5/test_empty.pyo
--- a/test/bytecode_1.5/test_exceptions.pyc
+++ b/test/bytecode_1.5/test_exceptions.pyc
--- a/test/bytecode_1.5/test_exceptions.pyo
+++ b/test/bytecode_1.5/test_exceptions.pyo
--- a/test/bytecode_1.5/test_exec.pyc
+++ b/test/bytecode_1.5/test_exec.pyc
--- a/test/bytecode_1.5/test_exec.pyo
+++ b/test/bytecode_1.5/test_exec.pyo
--- a/test/bytecode_1.5/test_expressions.pyc
+++ b/test/bytecode_1.5/test_expressions.pyc
--- a/test/bytecode_1.5/test_expressions.pyo
+++ b/test/bytecode_1.5/test_expressions.pyo
--- a/test/bytecode_1.5/test_functions.pyc
+++ b/test/bytecode_1.5/test_functions.pyc
--- a/test/bytecode_1.5/test_functions.pyo
+++ b/test/bytecode_1.5/test_functions.pyo
--- a/test/bytecode_1.5/test_global.pyc
+++ b/test/bytecode_1.5/test_global.pyc
--- a/test/bytecode_1.5/test_global.pyo
+++ b/test/bytecode_1.5/test_global.pyo
--- a/test/bytecode_1.5/test_globals.pyc
+++ b/test/bytecode_1.5/test_globals.pyc
--- a/test/bytecode_1.5/test_globals.pyo
+++ b/test/bytecode_1.5/test_globals.pyo
--- a/test/bytecode_1.5/test_import.pyc
+++ b/test/bytecode_1.5/test_import.pyc
--- a/test/bytecode_1.5/test_import.pyo
+++ b/test/bytecode_1.5/test_import.pyo
--- a/test/bytecode_1.5/test_integers.pyc
+++ b/test/bytecode_1.5/test_integers.pyc
--- a/test/bytecode_1.5/test_integers.pyo
+++ b/test/bytecode_1.5/test_integers.pyo
--- a/test/bytecode_1.5/test_lambda.pyc
+++ b/test/bytecode_1.5/test_lambda.pyc
--- a/test/bytecode_1.5/test_lambda.pyo
+++ b/test/bytecode_1.5/test_lambda.pyo
--- a/test/bytecode_1.5/test_loops.pyc
+++ b/test/bytecode_1.5/test_loops.pyc
--- a/test/bytecode_1.5/test_loops.pyo
+++ b/test/bytecode_1.5/test_loops.pyo
--- a/test/bytecode_1.5/test_misc.pyc
+++ b/test/bytecode_1.5/test_misc.pyc
--- a/test/bytecode_1.5/test_misc.pyo
+++ b/test/bytecode_1.5/test_misc.pyo
--- a/test/bytecode_1.5/test_nested_elif.pyc
+++ b/test/bytecode_1.5/test_nested_elif.pyc
--- a/test/bytecode_1.5/test_nested_elif.pyo
+++ b/test/bytecode_1.5/test_nested_elif.pyo
--- a/test/bytecode_1.5/test_prettyprint.pyc
+++ b/test/bytecode_1.5/test_prettyprint.pyc
--- a/test/bytecode_1.5/test_prettyprint.pyo
+++ b/test/bytecode_1.5/test_prettyprint.pyo
--- a/test/bytecode_1.5/test_print.pyc
+++ b/test/bytecode_1.5/test_print.pyc
--- a/test/bytecode_1.5/test_print.pyo
+++ b/test/bytecode_1.5/test_print.pyo
--- a/test/bytecode_1.5/test_single_stmt.pyc
+++ b/test/bytecode_1.5/test_single_stmt.pyc
--- a/test/bytecode_1.5/test_single_stmt.pyo
+++ b/test/bytecode_1.5/test_single_stmt.pyo
--- a/test/bytecode_1.5/test_slices.pyc
+++ b/test/bytecode_1.5/test_slices.pyc
--- a/test/bytecode_1.5/test_slices.pyo
+++ b/test/bytecode_1.5/test_slices.pyo
--- a/test/bytecode_1.5/test_tuple_params.pyc
+++ b/test/bytecode_1.5/test_tuple_params.pyc
--- a/test/bytecode_1.5/test_tuple_params.pyo
+++ b/test/bytecode_1.5/test_tuple_params.pyo
--- a/test/bytecode_1.5/test_tuples.pyc
+++ b/test/bytecode_1.5/test_tuples.pyc
--- a/test/bytecode_1.5/test_tuples.pyo
+++ b/test/bytecode_1.5/test_tuples.pyo
--- a/test/bytecode_1.5/tuple_params.pyc
+++ b/test/bytecode_1.5/tuple_params.pyc
--- a/test/test_pythonlib.py
+++ b/test/test_pythonlib.py
@@ -78,7 +78,8 @@ for  vers in (2.7, 3.4, 3.5, 3.6):
    test_options[key] = (os.path.join(src_dir, pythonlib), PYOC, key, vers)
    pass

-for  vers in (2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7,
+for  vers in (1.5,
+              2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7,
              3.1, 3.2, 3.3,
              3.4, 3.5, 3.6, 'pypy3.2', 'pypy2.7'):
    bytecode = "bytecode_%s" % vers
--- a/uncompyle6/scanners/scanner26.py
+++ b/uncompyle6/scanners/scanner26.py
@@ -224,11 +224,7 @@ class Scanner26(scan.Scanner2):
                elif op in self.opc.hasjabs:
                    pattr = repr(oparg)
                elif op in self.opc.haslocal:
-                    if self.version >= 2.0:
                    pattr = varnames[oparg]
-                    elif self.version < 2.0:
-                        if oparg < len(names):
-                            pattr = names[oparg]
                elif op in self.opc.hascompare:
                    pattr = self.opc.cmp_op[oparg]
                elif op in self.opc.hasfree: