Skip to content

Commit 79c9601

Browse files
isHarryhK0lb3
isHarryh
authored and
K0lb3
committed
fix: better type hint in EndianBinaryReader/Writer
1 parent 6f19ef2 commit 79c9601

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎UnityPy/helpers/Tpk.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ def Count(self) -> int:
475475
class TpkCommonString:
476476
__slots__ = ("VersionInformation", "StringBufferIndices")
477477
VersionInformation: List[Tuple[UnityVersion, int]]
478-
StringBufferIndices: Tuple[int]
478+
StringBufferIndices: Tuple[int, ...]
479479

480480
def __init__(self, stream: BytesIO) -> None:
481481
(versionCount,) = INT32.unpack(stream.read(INT32.size))

‎UnityPy/streams/EndianBinaryReader.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -208,39 +208,39 @@ def read_array_struct(self, param: str, length: Optional[int] = None) -> tuple:
208208
struct = Struct(f"{self.endian}{length}{param}")
209209
return struct.unpack(self.read(struct.size))
210210

211-
def read_boolean_array(self, length: Optional[int] = None) -> Tuple[bool]:
211+
def read_boolean_array(self, length: Optional[int] = None) -> Tuple[bool, ...]:
212212
return self.read_array_struct("?", length)
213213

214-
def read_u_byte_array(self, length: Optional[int] = None) -> Tuple[int]:
214+
def read_u_byte_array(self, length: Optional[int] = None) -> Tuple[int, ...]:
215215
return self.read_array_struct("B", length)
216216

217-
def read_u_short_array(self, length: Optional[int] = None) -> Tuple[int]:
217+
def read_u_short_array(self, length: Optional[int] = None) -> Tuple[int, ...]:
218218
return self.read_array_struct("h", length)
219219

220-
def read_short_array(self, length: Optional[int] = None) -> Tuple[int]:
220+
def read_short_array(self, length: Optional[int] = None) -> Tuple[int, ...]:
221221
return self.read_array_struct("H", length)
222222

223-
def read_int_array(self, length: Optional[int] = None) -> Tuple[int]:
223+
def read_int_array(self, length: Optional[int] = None) -> Tuple[int, ...]:
224224
return self.read_array_struct("i", length)
225225

226-
def read_u_int_array(self, length: Optional[int] = None) -> Tuple[int]:
226+
def read_u_int_array(self, length: Optional[int] = None) -> Tuple[int, ...]:
227227
return self.read_array_struct("I", length)
228228

229-
def read_long_array(self, length: Optional[int] = None) -> Tuple[int]:
229+
def read_long_array(self, length: Optional[int] = None) -> Tuple[int, ...]:
230230
return self.read_array_struct("q", length)
231231

232-
def read_u_long_array(self, length: Optional[int] = None) -> Tuple[int]:
232+
def read_u_long_array(self, length: Optional[int] = None) -> Tuple[int, ...]:
233233
return self.read_array_struct("Q", length)
234234

235-
def read_u_int_array_array(self, length: Optional[int] = None) -> List[Tuple[int]]:
235+
def read_u_int_array_array(self, length: Optional[int] = None) -> List[Tuple[int, ...]]:
236236
return self.read_array(
237237
self.read_u_int_array, length if length is not None else self.read_int()
238238
)
239239

240-
def read_float_array(self, length: Optional[int] = None) -> Tuple[float]:
240+
def read_float_array(self, length: Optional[int] = None) -> Tuple[float, ...]:
241241
return self.read_array_struct("f", length)
242242

243-
def read_double_array(self, length: Optional[int] = None) -> Tuple[float]:
243+
def read_double_array(self, length: Optional[int] = None) -> Tuple[float, ...]:
244244
return self.read_array_struct("d", length)
245245

246246
def read_string_array(self) -> List[str]:

‎UnityPy/streams/EndianBinaryWriter.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from io import BytesIO, IOBase
33

44
import builtins
5-
from typing import Callable, Union
5+
from typing import Callable, Sequence, Union
66

77
from ..math import Color, Matrix4x4, Quaternion, Vector2, Vector3, Vector4, Rectangle
88

@@ -144,7 +144,7 @@ def write_matrix(self, value: Matrix4x4):
144144
for val in value.M:
145145
self.write_float(val)
146146

147-
def write_array(self, command: Callable, value: list, write_length: bool = True):
147+
def write_array(self, command: Callable, value: Sequence, write_length: bool = True):
148148
if write_length:
149149
self.write_int(len(value))
150150
for val in value:
@@ -154,29 +154,29 @@ def write_byte_array(self, value: builtins.bytes):
154154
self.write_int(len(value))
155155
self.write(value)
156156

157-
def write_boolean_array(self, value: list):
157+
def write_boolean_array(self, value: Sequence):
158158
self.write_array(self.write_boolean, value)
159159

160-
def write_u_short_array(self, value: list):
160+
def write_u_short_array(self, value: Sequence):
161161
self.write_array(self.write_u_short, value)
162162

163-
def write_int_array(self, value: list, write_length: bool = False):
163+
def write_int_array(self, value: Sequence, write_length: bool = False):
164164
return self.write_array(self.write_int, value, write_length)
165165

166-
def write_u_int_array(self, value: list, write_length: bool = False):
166+
def write_u_int_array(self, value: Sequence, write_length: bool = False):
167167
return self.write_array(self.write_u_int, value, write_length)
168168

169-
def write_float_array(self, value: list, write_length: bool = False):
169+
def write_float_array(self, value: Sequence, write_length: bool = False):
170170
return self.write_array(self.write_float, value, write_length)
171171

172-
def write_string_array(self, value: list):
172+
def write_string_array(self, value: Sequence):
173173
self.write_array(self.write_aligned_string, value)
174174

175-
def write_vector2_array(self, value: list):
175+
def write_vector2_array(self, value: Sequence):
176176
self.write_array(self.write_vector2, value)
177177

178-
def write_vector4_array(self, value: list):
178+
def write_vector4_array(self, value: Sequence):
179179
self.write_array(self.write_vector4, value)
180180

181-
def write_matrix_array(self, value: list):
181+
def write_matrix_array(self, value: Sequence):
182182
self.write_array(self.write_matrix, value)

0 commit comments

Comments
 (0)