Merge branch 'master' into python-3.6-to-3.10

Author: rocky

uncompyle6/scanners/scanner2.py

@@ -208,11 +208,7 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None):
         if show_asm in ("both", "before"):
             print("\n# ---- disassembly:")
             bytecode.disassemble_bytes(
-                co.co_code,
-                varnames=co.co_varnames,
-                names=co.co_names,
-                constants=co.co_consts,
-                cells=bytecode._cell_names,
+                co,
                 line_starts=bytecode._linestarts,
                 asm_format="extended",
             )

uncompyle6/scanners/scanner26.py

@@ -82,11 +82,7 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None):
         if show_asm in ("both", "before"):
             print("\n# ---- disassembly:")
             bytecode.disassemble_bytes(
-                co.co_code,
-                varnames=co.co_varnames,
-                names=co.co_names,
-                constants=co.co_consts,
-                cells=bytecode._cell_names,
+                co,
                 line_starts=bytecode._linestarts,
                 asm_format="extended",
             )

uncompyle6/scanners/scanner3.py

@@ -424,11 +424,7 @@ def ingest(
         if show_asm in ("both", "before"):
             print("\n# ---- disassembly:")
             bytecode.disassemble_bytes(
-                co.co_code,
-                varnames=co.co_varnames,
-                names=co.co_names,
-                constants=co.co_consts,
-                cells=bytecode._cell_names,
+                co,
                 line_starts=bytecode._linestarts,
                 asm_format="extended",
             )

uncompyle6/scanners/scanner37base.py

@@ -230,10 +230,6 @@ def tokens_append(j, token):
             print("\n# ---- disassembly:")
             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",
                 filename=co.co_filename,