henklaak/fatamorgana
1
0
Fork 0
forked from jan/fatamorgana
Code Issues Pull Requests Releases Wiki Activity

use strict zip

Browse Source
This commit is contained in:
Jan Petykiewicz 2024-07-29 18:08:16 -07:00
parent dc9ed8e794
commit 691ce03150
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fatamorgana/basic.py
View File

@ -1485,13 +1485,13 @@ class ArbitraryRepetition:
size = write_uint(stream, 10)
size += write_uint(stream, len(self.x_displacements) - 1)
size += sum(Delta(x, y).write(stream)
for x, y in zip(self.x_displacements, self.y_displacements))
for x, y in zip(self.x_displacements, self.y_displacements, strict=True))
else:
size = write_uint(stream, 11)
size += write_uint(stream, len(self.x_displacements) - 1)
size += write_uint(stream, gcd)
size += sum(Delta(x // gcd, y // gcd).write(stream)
for x, y in zip(self.x_displacements, self.y_displacements))
for x, y in zip(self.x_displacements, self.y_displacements, strict=True))
return size
def __eq__(self, other: Any) -> bool:

16
fatamorgana/records.py
View File

@ -2632,22 +2632,22 @@ def dedup_field(record, r_field: str, modals: Modals, m_field: str) -> None:
Args:
InvalidDataError: if both fields are `None`
"""
r = getattr(record, r_field)
m = getattr(modals, m_field)
if r is not None:
rr = getattr(record, r_field)
mm = getattr(modals, m_field)
if rr is not None:
if m_field in ('polygon_point_list', 'path_point_list'):
if _USE_NUMPY:
equal = numpy.array_equal(m, r)
equal = numpy.array_equal(mm, rr)
else:
equal = (m is not None) and all(tuple(mm) == tuple(rr) for mm, rr in zip(m, r))
equal = (mm is not None) and all(tuple(mmm) == tuple(rrr) for mmm, rrr in zip(mm, rr, strict=True))
else:
equal = (m is not None) and m == r
equal = (mm is not None) and mm == rr
if equal:
setattr(record, r_field, None)
else:
setattr(modals, m_field, r)
elif m is None:
setattr(modals, m_field, rr)
elif mm is None:
raise InvalidDataError('Unfillable field')

2
fatamorgana/test/test_files_ctrapezoids.py
View File

@ -61,7 +61,7 @@ def write_file_1(buf: IO[bytes]) -> IO[bytes]:
+ [0b11, 0b10]
)
for t, (x, x_en) in enumerate(zip(wh, wh_en)):
for t, (x, x_en) in enumerate(zip(wh, wh_en, strict=True)):
write_uint(buf, 26) # CTRAPEZOID record
write_byte(buf, 0b1000_1011 | (x_en << 5)) # TWHX_YRDL
write_uint(buf, 1) # layer