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] 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 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