Skip to content

Commit c8625ec

Browse files
committed
Fix/ignore some type check "errors"
1 parent 1ca55e4 commit c8625ec

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

setuptools/command/_macosx_libfile.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,11 @@ def get_base_class_and_magic_number(
276276
if sys.byteorder == "little":
277277
BaseClass = ctypes.BigEndianStructure
278278
else:
279-
BaseClass = ctypes.LittleEndianStructure
279+
BaseClass = ctypes.LittleEndianStructure # type: ignore[assignment]
280280

281281
magic_number = swap32(magic_number)
282282
else:
283-
BaseClass = ctypes.Structure
283+
BaseClass = ctypes.Structure # type: ignore[assignment]
284284

285285
lib_file.seek(seek)
286286
return BaseClass, magic_number
@@ -298,18 +298,18 @@ def extract_macosx_min_system_version(path_to_lib: str): # noqa: C901
298298

299299
if magic_number in [FAT_MAGIC, FAT_CIGAM_64]:
300300

301-
class FatHeader(BaseClass):
301+
class FatHeader(BaseClass): # type: ignore[misc,valid-type]
302302
_fields_ = fat_header_fields
303303

304304
fat_header = read_data(FatHeader, lib_file)
305305
if magic_number == FAT_MAGIC:
306306

307-
class FatArch(BaseClass):
307+
class FatArch(BaseClass): # type: ignore[misc,valid-type]
308308
_fields_ = fat_arch_fields
309309

310310
else:
311311

312-
class FatArch(BaseClass):
312+
class FatArch(BaseClass): # type: ignore[misc,valid-type,no-redef]
313313
_fields_ = fat_arch_64_fields
314314

315315
fat_arch_list = [
@@ -361,17 +361,17 @@ def read_mach_header(
361361
base_class, magic_number = get_base_class_and_magic_number(lib_file, seek)
362362
arch = "32" if magic_number == MH_MAGIC else "64"
363363

364-
class SegmentBase(base_class):
364+
class SegmentBase(base_class): # type: ignore[misc,valid-type]
365365
_fields_ = segment_base_fields
366366

367367
if arch == "32":
368368

369-
class MachHeader(base_class):
369+
class MachHeader(base_class): # type: ignore[misc,valid-type]
370370
_fields_ = mach_header_fields
371371

372372
else:
373373

374-
class MachHeader(base_class):
374+
class MachHeader(base_class): # type: ignore[misc,valid-type,no-redef]
375375
_fields_ = mach_header_fields_64
376376

377377
mach_header = read_data(MachHeader, lib_file)
@@ -381,14 +381,14 @@ class MachHeader(base_class):
381381
lib_file.seek(pos)
382382
if segment_base.cmd == LC_VERSION_MIN_MACOSX:
383383

384-
class VersionMinCommand(base_class):
384+
class VersionMinCommand(base_class): # type: ignore[misc,valid-type]
385385
_fields_ = version_min_command_fields
386386

387387
version_info = read_data(VersionMinCommand, lib_file)
388388
return parse_version(version_info.version)
389389
elif segment_base.cmd == LC_BUILD_VERSION:
390390

391-
class VersionBuild(base_class):
391+
class VersionBuild(base_class): # type: ignore[misc,valid-type]
392392
_fields_ = build_version_command_fields
393393

394394
version_info = read_data(VersionBuild, lib_file)
@@ -397,6 +397,8 @@ class VersionBuild(base_class):
397397
lib_file.seek(pos + segment_base.cmdsize)
398398
continue
399399

400+
return None
401+
400402

401403
def parse_version(version: int) -> tuple[int, int, int]:
402404
x = (version & 0xFFFF0000) >> 16
@@ -411,8 +413,8 @@ def calculate_macosx_platform_tag(archive_root: StrPath, platform_tag: str) -> s
411413
412414
Example platform tag `macosx-10.14-x86_64`
413415
"""
414-
prefix, base_version, suffix = platform_tag.split("-")
415-
base_version = tuple(int(x) for x in base_version.split("."))
416+
prefix, base_version_, suffix = platform_tag.split("-")
417+
base_version = tuple(int(x) for x in base_version_.split("."))
416418
base_version = base_version[:2]
417419
if base_version[0] > 10:
418420
base_version = (base_version[0], 0)
@@ -457,7 +459,6 @@ def calculate_macosx_platform_tag(archive_root: StrPath, platform_tag: str) -> s
457459
fin_base_version = "_".join([str(x) for x in base_version])
458460
if start_version < base_version:
459461
problematic_files = [k for k, v in versions_dict.items() if v > start_version]
460-
problematic_files = "\n".join(problematic_files)
461462
if len(problematic_files) == 1:
462463
files_form = "this file"
463464
else:
@@ -469,7 +470,7 @@ def calculate_macosx_platform_tag(archive_root: StrPath, platform_tag: str) -> s
469470
+ " or recreate "
470471
+ files_form
471472
+ " with lower "
472-
"MACOSX_DEPLOYMENT_TARGET: \n" + problematic_files
473+
"MACOSX_DEPLOYMENT_TARGET: \n" + "\n".join(problematic_files)
473474
)
474475

475476
if "MACOSX_DEPLOYMENT_TARGET" in os.environ:

0 commit comments

Comments
 (0)