More remenants of API changes

Author: rocky

xdis/bytecode.py

@@ -470,9 +470,11 @@ def get_instructions_bytes(
     constants: tuple = code_object.co_consts
     names: tuple = code_object.co_names
     varnames: tuple = code_object.co_varnames
-    cells: tuple = code_object.co_cellvars if hasattr(code_object, "co_cellvars") else tuple()
+    cellvars: tuple = code_object.co_cellvars if hasattr(code_object, "co_cellvars") else tuple()
     exception_entries = code_object.exception_entries if hasattr(code_object, "exception_entries") else tuple()
-    # freevars: tuple = code_object.co_freevars
+    freevars: tuple = code_object.co_cellvars if hasattr(code_object, "co_freevars") else tuple()
+
+    cells = cellvars + freevars
 
     labels = opc.findlabels(bytecode, opc)
     if hasattr(opc, "findlinestarts"):

xdis/lineoffsets.py

@@ -54,11 +54,6 @@ def _populate_lines(self) -> None:
         for instr in get_instructions_bytes(
             code_object=code,
             opc=self.opc,
-            varnames=code.co_varnames,
-            names=code.co_names,
-            constants=code.co_consts,
-            cells=code.co_cellvars + code.co_freevars,
-            linestarts=self.linestarts,
         ):
             offset = instr.offset
             self.offsets.append(offset)