From fcbda1d3843ac3b7ec58a5703ce7bb4003e1e35a Mon Sep 17 00:00:00 2001 From: launchdaemon <7250222+launchdaemon@users.noreply.github.com> Date: Fri, 27 Jun 2025 14:17:33 +0100 Subject: [PATCH 1/3] migrate from deprecated pkg_resources to importlib --- src/ktool/util.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ktool/util.py b/src/ktool/util.py index 17cc048..f7dcd09 100644 --- a/src/ktool/util.py +++ b/src/ktool/util.py @@ -24,7 +24,7 @@ from ktool_macho import Struct, FAT_CIGAM, FAT_MAGIC, MH_CIGAM, MH_CIGAM_64, MH_MAGIC, MH_MAGIC_64 from ktool.exceptions import * -import pkg_resources +import importlib.metadata import lib0cyn.log as log @@ -39,8 +39,8 @@ JsonLexer = None try: - KTOOL_VERSION = pkg_resources.get_distribution('k2l').version -except pkg_resources.DistributionNotFound: + KTOOL_VERSION = importlib.metadata.version('k2l') +except importlib.metadata.PackageNotFoundError: KTOOL_VERSION = '1.0.0' THREAD_COUNT = os.cpu_count() - 1 From 6adc546db60f8e5e061a785f9dc2dd028ba51b96 Mon Sep 17 00:00:00 2001 From: launchdaemon <7250222+launchdaemon@users.noreply.github.com> Date: Fri, 27 Jun 2025 14:25:59 +0100 Subject: [PATCH 2/3] move to packaging library rather than pkg_resources --- src/ktool/ktool_script.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/ktool/ktool_script.py b/src/ktool/ktool_script.py index dc2a130..689804b 100644 --- a/src/ktool/ktool_script.py +++ b/src/ktool/ktool_script.py @@ -25,12 +25,7 @@ from enum import Enum from typing import Union -try: - # noinspection PyProtectedMember - from pkg_resources import packaging -except ImportError: - # noinspection PyProtectedMember - from pkg_resources._vendor import packaging +import packaging import ktool from ktool_macho import LOAD_COMMAND From adddfcd3d6a605f09ffc6306bc8520f1db62247b Mon Sep 17 00:00:00 2001 From: launchdaemon <7250222+launchdaemon@users.noreply.github.com> Date: Mon, 30 Jun 2025 11:32:15 +0100 Subject: [PATCH 3/3] added packaging dependency --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 630acba..9b144bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,6 +22,7 @@ ktool = "ktool.ktool_script:main" [tool.poetry.dependencies] python = "^3.6.2" Pygments = "^2.11.2" +packaging = ">=21.3" windows-curses = {version = "^2.3.1", platform = "win32"} [tool.poetry.dev-dependencies]