KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apparently only importlib_resources has actually deprecated contents()

Browse Source
This commit is contained in:
Kovid Goyal 2021-10-20 11:15:51 +05:30
parent 7f2ce045ab
commit 8f0b3983ee
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kitty/constants.py
View File

@ -182,12 +182,7 @@ def resolve_custom_file(path: str) -> str:
def list_kitty_resources(package: str = 'kitty') -> Iterable[str]: def list_kitty_resources(package: str = 'kitty') -> Iterable[str]:
if sys.version_info >= (3, 9): if sys.version_info < (3, 7):
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):
from importlib_resources import files from importlib_resources import files
def contents(package: str) -> Iterable[str]: 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: def read_kitty_resource(name: str, package_name: str = 'kitty') -> bytes:
if sys.version_info >= (3, 9): if sys.version_info < (3, 7):
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):
from importlib_resources import files from importlib_resources import files
def read_binary(package: str, resource: str) -> bytes: def read_binary(package: str, resource: str) -> bytes:

7
kitty_tests/main.py
View File

@ -9,12 +9,7 @@ import unittest
from typing import Callable, Generator, NoReturn, Sequence, Set, Iterable from typing import Callable, Generator, NoReturn, Sequence, Set, Iterable
if sys.version_info >= (3, 9): if sys.version_info < (3, 7):
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):
from importlib_resources import files from importlib_resources import files
def contents(package: str) -> Iterable[str]: def contents(package: str) -> Iterable[str]: