|
16 | 16 | import sys
|
17 | 17 | import warnings
|
18 | 18 | from collections.abc import Iterator
|
19 |
| -from typing import Any |
20 | 19 |
|
21 | 20 | from setuptools import Extension, setup
|
22 | 21 | from setuptools.command.build_ext import build_ext
|
@@ -148,7 +147,7 @@ class RequiredDependencyException(Exception):
|
148 | 147 | PLATFORM_MINGW = os.name == "nt" and "GCC" in sys.version
|
149 | 148 |
|
150 | 149 |
|
151 |
| -def _dbg(s: str, tp: Any = None) -> None: |
| 150 | +def _dbg(s: str, tp: str | tuple[str, ...] | None = None) -> None: |
152 | 151 | if DEBUG:
|
153 | 152 | if tp:
|
154 | 153 | print(s % tp)
|
@@ -509,11 +508,11 @@ def build_extensions(self) -> None:
|
509 | 508 |
|
510 | 509 | if root is None and pkg_config:
|
511 | 510 | if isinstance(lib_name, str):
|
512 |
| - _dbg(f"Looking for `{lib_name}` using pkg-config.") |
| 511 | + _dbg("Looking for `%s` using pkg-config.", lib_name) |
513 | 512 | root = pkg_config(lib_name)
|
514 | 513 | else:
|
515 | 514 | for lib_name2 in lib_name:
|
516 |
| - _dbg(f"Looking for `{lib_name2}` using pkg-config.") |
| 515 | + _dbg("Looking for `%s` using pkg-config.", lib_name2) |
517 | 516 | root = pkg_config(lib_name2)
|
518 | 517 | if root:
|
519 | 518 | break
|
@@ -732,7 +731,7 @@ def build_extensions(self) -> None:
|
732 | 731 | best_path = os.path.join(directory, name)
|
733 | 732 | _dbg(
|
734 | 733 | "Best openjpeg version %s so far in %s",
|
735 |
| - (best_version, best_path), |
| 734 | + (str(best_version), best_path), |
736 | 735 | )
|
737 | 736 |
|
738 | 737 | if best_version and _find_library_file(self, "openjp2"):
|
|
0 commit comments