Remove co_lnotab depreciatation messages

Author: rocky

pytest/test_load_file.py

@@ -5,6 +5,7 @@
 from xdis import IS_GRAAL, IS_PYPY
 from xdis.codetype import CodeTypeUnionFields
 from xdis.load import check_object_path, load_file, load_module
+from xdis.version_info import PYTHON_VERSION_TRIPLE
 
 
 def get_srcdir() -> str:
@@ -59,6 +60,8 @@ def test_load_file() -> None:
         fields = CodeTypeUnionFields
 
     for field in fields:
+        if field == "co_lnotab" and PYTHON_VERSION_TRIPLE >= (3, 11):
+            continue
         if hasattr(co_file, field):
             if field == "co_code" and (pypy or IS_PYPY):
                 continue

pytest/test_std.py

@@ -202,6 +202,13 @@ def _create_python3_code_object():
 
         code = list2bytecode(instructions, opcodes.opcode_34, varnames, consts)
         fn_code = compile(text, "<string>", "exec")
+
+        line_table_value = (
+            fn_code.co_lnotab
+            if PYTHON_VERSION_TRIPLE < (3, 11) and hasattr(fn_code, "co_lnotab")
+            else fn_code.co_linetable
+        )
+
         return Code3(
             fn_code.co_argcount,
             fn_code.co_kwonlyargcount,  # Add this in Python3
@@ -216,7 +223,7 @@ def _create_python3_code_object():
             fn_code.co_filename,
             fn_code.co_name,
             fn_code.co_firstlineno,
-            fn_code.co_lnotab,  # In general, You should adjust this
+            line_table_value,
             fn_code.co_freevars,
             fn_code.co_cellvars,
         )

xdis/codetype/__init__.py

@@ -30,6 +30,7 @@
 
 __docformat__ = "restructuredtext"
 
+
 def codeType2Portable(code, version_triple=PYTHON_VERSION_TRIPLE):
     """Converts a native types.CodeType code object into a
     corresponding more flexible xdis Code type.
@@ -40,7 +41,11 @@ def codeType2Portable(code, version_triple=PYTHON_VERSION_TRIPLE):
         raise TypeError(
             f"parameter expected to be a types.CodeType type; is {type(code)} instead"
         )
-    line_table_field = "co_lnotab" if hasattr(code, "co_lnotab") else "co_linetable"
+    line_table_field = (
+        "co_lnotab"
+        if PYTHON_VERSION_TRIPLE < (3, 11) and hasattr(code, "co_lnotab")
+        else "co_linetable"
+    )
     line_table = getattr(code, line_table_field)
     if version_triple >= (3, 0):
         if version_triple < (3, 8):
@@ -60,7 +65,6 @@ def codeType2Portable(code, version_triple=PYTHON_VERSION_TRIPLE):
                 line_table,
                 code.co_freevars,
                 code.co_cellvars,
-
                 # THINK ABOUT: If collection_order isn't defined, i.e. native code
                 # type, should we try to extract it?
                 code.collection_order if hasattr(code, "collection_order") else {},
@@ -146,13 +150,15 @@ def codeType2Portable(code, version_triple=PYTHON_VERSION_TRIPLE):
             co_lnotab=line_table,
             co_freevars=code.co_freevars,  # not in 1.x
             co_cellvars=code.co_cellvars,  # not in 1.x
-
             # THINK ABOUT: If collection_order isn't defined, i.e. native code
             # type, should we try to extract it?
-            collection_order=code.collection_order if hasattr(code, "collection_order") else {},
-            reference_objects=code.reference_objects if hasattr(code, "reference_objects") else set(),
+            collection_order=(
+                code.collection_order if hasattr(code, "collection_order") else {}
+            ),
+            reference_objects=(
+                code.reference_objects if hasattr(code, "reference_objects") else set()
+            ),
             version_triple=version_triple,
-
         )
     else:
         # 1.0 .. 1.5
@@ -219,7 +225,10 @@ def portableCodeType(version_triple=PYTHON_VERSION_TRIPLE):
 # In contrast to Code3, Code2, etc. you can use CodeTypeUnint for building
 # an incomplete code type, which might be converted to another code type
 # later.
-CodeTypeUnionFields = tuple(Code311FieldNames.split() + ["collection_order", "reference_objects", "version_triple"])
+CodeTypeUnionFields = tuple(
+    Code311FieldNames.split()
+    + ["collection_order", "reference_objects", "version_triple"]
+)
 CodeTypeUnion = namedtuple("CodeTypeUnion", CodeTypeUnionFields)
 
 
@@ -229,21 +238,21 @@ def to_portable(
     co_argcount: int,
     co_posonlyargcount: Optional[int] = -1,  # 3.8 .. 3.10
     co_kwonlyargcount: Optional[int] = -1,  # 3.0+
-    co_nlocals: int=0,
+    co_nlocals: int = 0,
     co_stacksize: Optional[int] = -1,  # 1.5+
-    co_flags: int=0,
-    co_code: Union[str, bytes]="",  # 3.0+ this type changes from <str> to <bytes>
-    co_consts: tuple[str, ...]=tuple(),
-    co_names: tuple[str, ...]=tuple(),
-    co_varnames: tuple[str, ...]=tuple(),
-    co_filename: str="??",
-    co_name: str="??",
-    co_qualname: str="??",
-    co_firstlineno: int=-1,
-    co_lnotab: str="",  # 1.5+; 3.0+ this type changes from <str> to <bytes>
+    co_flags: int = 0,
+    co_code: Union[str, bytes] = "",  # 3.0+ this type changes from <str> to <bytes>
+    co_consts: tuple[str, ...] = tuple(),
+    co_names: tuple[str, ...] = tuple(),
+    co_varnames: tuple[str, ...] = tuple(),
+    co_filename: str = "??",
+    co_name: str = "??",
+    co_qualname: str = "??",
+    co_firstlineno: int = -1,
+    co_lnotab: str = "",  # 1.5+; 3.0+ this type changes from <str> to <bytes>
     # In 3.11 it is different
-    co_freevars: tuple[str, ...]=tuple(),  # 2.0+
-    co_cellvars: tuple[str, ...]=tuple(),  # 2.0+
+    co_freevars: tuple[str, ...] = tuple(),  # 2.0+
+    co_cellvars: tuple[str, ...] = tuple(),  # 2.0+
     co_exceptiontable=None,  # 3.11+
     version_triple=PYTHON_VERSION_TRIPLE,
     collection_order: Dict[Union[set, frozenset, dict], Tuple[Any]] = {},
@@ -265,6 +274,7 @@ def to_portable(
         co_qualname=co_name if co_qualname is None else co_qualname,
         co_firstlineno=co_firstlineno,
         co_linetable=co_lnotab,
+        co_lnotab=co_lnotab,
         co_freevars=co_freevars,
         co_cellvars=co_cellvars,
         co_exceptiontable=co_exceptiontable,

xdis/codetype/code311.py

@@ -28,6 +28,8 @@
 # "posonlyargcount" is not used, but it is in other Python versions, so it
 # has to be included since this structure is used as the Union type
 # for all code types.
+#
+# Methods co_lines and co_positions do not get added to field names.
 Code311FieldNames = """
         co_argcount
         co_posonlyargcount
@@ -46,11 +48,12 @@
         co_qualname
         co_firstlineno
         co_linetable
+        co_lnotab
         co_exceptiontable
 """
 
 Code311FieldTypes = deepcopy(Code310FieldTypes)
-Code311FieldTypes.update({"co_qualname": str, "co_exceptiontable": bytes})
+Code311FieldTypes.update({"co_qualname": str, "co_exceptiontable": bytes, "co_linetable": bytes})
 
 
 ##### Parse location table #####
@@ -110,7 +113,7 @@ def get_value(b):
                 current_value = 0
                 shift_amt = 0
 
-    def decode_signed_varint(s: int):
+    def decode_signed_varint(s: int) -> int:
         return -(s >> 1) if s & 1 else (s >> 1)
 
     entries = (
@@ -453,8 +456,6 @@ def to_native(self) -> CodeType:
         except AssertionError as e:
             raise TypeError(e)
 
-        if code.co_exceptiontable is None:
-            code.co_exceptiontable = b""
         return types.CodeType(
             code.co_argcount,
             code.co_posonlyargcount,