Populate code.version_triple more often

Author: rocky

xdis/codetype/__init__.py

@@ -85,6 +85,7 @@ def codeType2Portable(code, version_triple=PYTHON_VERSION_TRIPLE):
                 co_name=code.co_name,
                 co_firstlineno=code.co_firstlineno,
                 co_lnotab=line_table,
+                version_triple=version_triple,
             )
         elif version_triple[:2] == (3, 10) or IS_PYPY and version_triple[:2] == (3, 11):
             return Code310(
@@ -104,6 +105,7 @@ def codeType2Portable(code, version_triple=PYTHON_VERSION_TRIPLE):
                 co_name=code.co_name,
                 co_firstlineno=code.co_firstlineno,
                 co_linetable=line_table,
+                version_triple=version_triple,
             )
         elif version_triple[:2] >= (3, 11):
             return Code311(
@@ -125,6 +127,7 @@ def codeType2Portable(code, version_triple=PYTHON_VERSION_TRIPLE):
                 co_firstlineno=code.co_firstlineno,
                 co_linetable=line_table,
                 co_exceptiontable=code.co_exceptiontable,
+                version_triple=version_triple,
             )
     elif version_triple > (2, 0):
         # 2.0 .. 2.7
@@ -148,6 +151,7 @@ def codeType2Portable(code, version_triple=PYTHON_VERSION_TRIPLE):
             # 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(),
+            version_triple=version_triple,
 
         )
     else:

xdis/codetype/code311.py

@@ -430,8 +430,8 @@ def __init__(
             co_linetable=co_linetable,
             co_freevars=co_freevars,
             co_cellvars=co_cellvars,
-            reference_objects = set(),
-            version_triple = (0, 0, 0),
+            reference_objects = reference_objects,
+            version_triple = version_triple,
         )
         self.co_qualname = co_qualname
         self.co_exceptiontable = co_exceptiontable

xdis/codetype/code38.py

@@ -107,8 +107,8 @@ def __init__(
             co_freevars=co_freevars,
             co_cellvars=co_cellvars,
             collection_order = collection_order,
-            reference_objects = set(),
-            version_triple = (0, 0, 0),
+            reference_objects = reference_objects,
+            version_triple = version_triple,
         )
         self.co_posonlyargcount = co_posonlyargcount
         self.fieldtypes = Code38FieldTypes

xdis/unmarshal.py

@@ -173,29 +173,28 @@ def __init__(self, fp, magic_int, bytes_for_s, code_objects={}) -> None:
         self.collection_order: Dict[Union[set, frozenset, dict], Tuple[Any]] = {}
 
         self.bytes_for_s = bytes_for_s
-        version = magic_int2tuple(self.magic_int)
-        if version >= (3, 4):
+        self.version_triple = magic_int2tuple(self.magic_int)
+        if self.version_triple >= (3, 4):
             if self.magic_int in (3250, 3260, 3270):
                 self.marshal_version = 3
             else:
                 self.marshal_version = 4
-        elif (3, 4) > version >= (2, 5):
+        elif (3, 4) > self.version_triple >= (2, 5):
             self.marshal_version = 2
-        elif (2, 5) > version >= (2, 4):
+        elif (2, 5) > self.version_triple >= (2, 4):
             self.marshal_version = 1
         else:
             self.marshal_version = 0
 
         self.intern_strings = []
         self.intern_objects = []
-        self.version_triple = tuple()
         self.is_graal = magic_int in GRAAL3_MAGICS
         self.is_pypy = magic_int in PYPY3_MAGICS
         self.is_rust = magic_int in RUSTPYTHON_MAGICS
 
         if magic_int in RUSTPYTHON_MAGICS:
             raise NotImplementedError(
-                f"RustPython {version_tuple_to_str(version)} is not supported yet."
+                f"RustPython {version_tuple_to_str(self.version_triple)} is not supported yet."
             )
 
     def load(self):