mirror of
https://github.com/kovidgoyal/kitty.git
synced 2024-09-21 19:47:21 +03:00
Apparently only importlib_resources has actually deprecated contents()
This commit is contained in:
parent
7f2ce045ab
commit
8f0b3983ee
@ -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 contents(package: str) -> 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:
|
||||
|
@ -9,12 +9,7 @@
|
||||
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]:
|
||||
|
Loading…
Reference in New Issue
Block a user