remove code312 type and organize

Author: 2elli

xdis/codetype/__init__.py

@@ -28,7 +28,6 @@
 from xdis.codetype.code38 import Code38
 from xdis.codetype.code310 import Code310
 from xdis.codetype.code311 import Code311, Code311FieldNames
-from xdis.codetype.code312 import Code312
 from xdis.version_info import PYTHON_VERSION_TRIPLE
 
 
@@ -101,7 +100,7 @@ def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
                 co_firstlineno=code.co_firstlineno,
                 co_linetable=line_table,
             )
-        elif version_tuple[:2] == (3,11):
+        elif version_tuple[:2] >= (3,11):
             return Code311(
                 co_argcount=code.co_argcount,
                 co_posonlyargcount=code.co_posonlyargcount,
@@ -122,27 +121,6 @@ def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
                 co_linetable=line_table,
                 co_exceptiontable=code.co_exceptiontable,
             )
-        elif version_tuple[:2] >= (3,12):
-            return Code312(
-                co_argcount=code.co_argcount,
-                co_posonlyargcount=code.co_posonlyargcount,
-                co_kwonlyargcount=code.co_kwonlyargcount,
-                co_nlocals=code.co_nlocals,
-                co_stacksize=code.co_stacksize,
-                co_flags=code.co_flags,
-                co_consts=code.co_consts,
-                co_code=code.co_code,
-                co_names=code.co_names,
-                co_varnames=code.co_varnames,
-                co_freevars=code.co_freevars,
-                co_cellvars=code.co_cellvars,
-                co_filename=code.co_filename,
-                co_name=code.co_name,
-                co_qualname=code.co_qualname,
-                co_firstlineno=code.co_firstlineno,
-                co_linetable=line_table,
-                co_exceptiontable=code.co_exceptiontable,
-            )
     elif version_tuple > (2, 0):
         # 2.0 .. 2.7
         return Code2(
@@ -209,11 +187,9 @@ def portableCodeType(version_tuple=PYTHON_VERSION_TRIPLE):
         elif version_tuple[:2] == (3, 10):
             # 3.10
             return Code310
-        elif version_tuple[:2] == (3,11):
+        elif version_tuple[:2] >= (3,11):
             # 3.11 ...
             return Code311
-        elif version_tuple[:2] >= (3,12):
-            return Code312
     elif version_tuple > (2, 0):
         # 2.0 .. 2.7
         return Code2

xdis/codetype/code311.py

@@ -23,6 +23,37 @@
 from xdis.version_info import PYTHON_VERSION_TRIPLE, version_tuple_to_str
 
 
+# Note: order is the positional order given in the Python docs for
+# 3.11 types.Codetype.
+# "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.
+Code311FieldNames = """
+        co_argcount
+        co_posonlyargcount
+        co_kwonlyargcount
+        co_nlocals
+        co_stacksize
+        co_flags
+        co_consts
+        co_code
+        co_names
+        co_varnames
+        co_freevars
+        co_cellvars
+        co_filename
+        co_name
+        co_qualname
+        co_firstlineno
+        co_linetable
+        co_exceptiontable
+"""
+
+Code311FieldTypes = deepcopy(Code310FieldTypes)
+Code311FieldTypes.update({"co_qualname": str, "co_exceptiontable": bytes})
+
+
+##### Parse location table #####
 def parse_location_entries(location_bytes, first_line):
     """
     Parses the locations table described in: https://github.com/python/cpython/blob/3.11/Objects/locations.md
@@ -131,36 +162,6 @@ def decode_signed_varint(s):
     return entries
 
 
-# Note: order is the positional order given in the Python docs for
-# 3.11 types.Codetype.
-# "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.
-Code311FieldNames = """
-        co_argcount
-        co_posonlyargcount
-        co_kwonlyargcount
-        co_nlocals
-        co_stacksize
-        co_flags
-        co_consts
-        co_code
-        co_names
-        co_varnames
-        co_freevars
-        co_cellvars
-        co_filename
-        co_name
-        co_qualname
-        co_firstlineno
-        co_linetable
-        co_exceptiontable
-"""
-
-Code311FieldTypes = deepcopy(Code310FieldTypes)
-Code311FieldTypes.update({"co_qualname": str, "co_exceptiontable": bytes})
-
-
 ##### NEW "OPAQUE" LINE TABLE PARSING #####
 # See: https://github.com/python/cpython/blob/aaed91cabcedc16c089c4b1c9abb1114659a83d3/Objects/codeobject.c#L1245C1-L1245C17
 PY_CODE_LOCATION_INFO_SHORT0 = 0