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

More pointless code churn thanks to importlib.resources

Browse Source 
They've deprecated a bunch of API but the suggested replacement is
either not present in versions of python that are not EOLed or doesn't
actually work.
This commit is contained in:
Kovid Goyal 2022-11-03 12:13:47 +05:30
parent e309e54002
commit 93563f1280
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/constants.py
View File

@ -221,6 +221,8 @@ def running_in_kitty(set_val: Optional[bool] = None) -> bool:
def list_kitty_resources(package: str = 'kitty') -> Iterator[str]:
try:
if sys.version_info[:2] < (3, 10):
raise ImportError('importlib.resources.files() doesnt work with frozen builds on python 3.9')
from importlib.resources import files
except ImportError:
from importlib.resources import contents
@ -231,6 +233,8 @@ def list_kitty_resources(package: str = 'kitty') -> Iterator[str]:
def read_kitty_resource(name: str, package_name: str = 'kitty') -> bytes:
try:
if sys.version_info[:2] < (3, 10):
raise ImportError('importlib.resources.files() doesnt work with frozen builds on python 3.9')
from importlib.resources import files
except ImportError:
from importlib.resources import read_binary

5
kitty_tests/main.py
View File

@ -4,12 +4,15 @@
import importlib
import os
import shutil
import sys
import unittest
from typing import Callable, Generator, NoReturn, Sequence, Set, Iterator
from typing import Callable, Generator, Iterator, NoReturn, Sequence, Set
def contents(package: str) -> Iterator[str]:
try:
if sys.version_info[:2] < (3, 10):
raise ImportError('importlib.resources.files() doesnt work with frozen builds on python 3.9')
from importlib.resources import files
except ImportError:
from importlib.resources import contents