diff --git a/kitty/constants.py b/kitty/constants.py index 901ab1930..06174dcf4 100644 --- a/kitty/constants.py +++ b/kitty/constants.py @@ -182,12 +182,7 @@ def resolve_custom_file(path: str) -> str: def list_kitty_resources(package: str = 'kitty') -> Iterable[str]: - if sys.version_info >= (3, 9): - from importlib.resources import files - - def contents(package: str) -> Iterable[str]: - return (path.name for path in files(package).iterdir()) - elif sys.version_info < (3, 7): + if sys.version_info < (3, 7): from importlib_resources import files def contents(package: str) -> Iterable[str]: @@ -198,12 +193,7 @@ def list_kitty_resources(package: str = 'kitty') -> Iterable[str]: def read_kitty_resource(name: str, package_name: str = 'kitty') -> bytes: - if sys.version_info >= (3, 9): - from importlib.resources import files - - def read_binary(package: str, resource: str) -> bytes: - return (files(package) / resource).read_bytes() - elif sys.version_info < (3, 7): + if sys.version_info < (3, 7): from importlib_resources import files def read_binary(package: str, resource: str) -> bytes: diff --git a/kitty_tests/main.py b/kitty_tests/main.py index 288cb8fd4..35d000a6e 100644 --- a/kitty_tests/main.py +++ b/kitty_tests/main.py @@ -9,12 +9,7 @@ import unittest from typing import Callable, Generator, NoReturn, Sequence, Set, Iterable -if sys.version_info >= (3, 9): - from importlib.resources import files - - def contents(package: str) -> Iterable[str]: - return (path.name for path in files(package).iterdir()) -elif sys.version_info < (3, 7): +if sys.version_info < (3, 7): from importlib_resources import files def contents(package: str) -> Iterable[str]: