Fix some 2.6 bytecode bugs

scanner26: disassemble interface has changed
make_function2: was missing ParserError2 import

Author: rocky

uncompyle6/scanners/scanner26.py

@@ -81,9 +81,15 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None):
         # show_asm = 'after'
         if show_asm in ("both", "before"):
             print("\n# ---- disassembly:")
-            for instr in bytecode.get_instructions(co):
-                print(instr.disassemble(self.opc))
-
+            bytecode.disassemble_bytes(
+                co.co_code,
+                varnames=co.co_varnames,
+                names=co.co_names,
+                constants=co.co_consts,
+                cells=bytecode._cell_names,
+                line_starts=bytecode._linestarts,
+                asm_format="extended",
+            )
         # Container for tokens
         tokens = []
 

uncompyle6/semantics/make_function2.py

@@ -22,6 +22,7 @@
 
 from xdis import code_has_star_arg, code_has_star_star_arg, iscode
 
+from uncompyle6.parser import ParserError as ParserError2
 from uncompyle6.scanner import Code
 from uncompyle6.semantics.helper import (
     find_all_globals,