@@ -123,17 +123,14 @@ def __init__(self, reader, serialized_file):
123123 self .old_type_hash = reader .read_bytes (16 ) # Hash128
124124
125125 if serialized_file ._enable_type_tree :
126- type_tree = None
127126 if version >= 12 or version == 10 :
128- type_tree , self .string_data = serialized_file .read_type_tree_blob ()
127+ self . nodes , self .string_data = serialized_file .read_type_tree_blob ()
129128 else :
130- type_tree = serialized_file .read_type_tree ()
129+ self . nodes = serialized_file .read_type_tree ()
131130
132131 if version >= 21 :
133132 self .type_dependencies = reader .read_int_array ()
134133
135- self .nodes = type_tree
136-
137134 def write (self , serialized_file , writer ):
138135 version = serialized_file .header .version
139136 writer .write_int (self .class_id )
@@ -239,6 +236,8 @@ def __init__(self, reader: EndianBinaryReader, parent=None, name=None):
239236 # ReadTypes
240237 type_count = reader .read_int ()
241238 self .types = [SerializedType (reader , self ) for _ in range (type_count )]
239+ if config .SERIALIZED_FILE_PARSE_TYPETREE is False :
240+ self ._enable_type_tree = False
242241
243242 self .big_id_enabled = 0
244243 if 7 <= header .version < 14 :
@@ -368,7 +367,7 @@ def read_type_tree_blob(self):
368367 )
369368
370369 if not config .SERIALIZED_FILE_PARSE_TYPETREE :
371- return string_buffer_reader .bytes
370+ return [], string_buffer_reader .bytes
372371
373372 type_tree = [None ] * number_of_nodes
374373 for i , raw_node in enumerate (node_struct .iter_unpack (struct_data )):
0 commit comments