Update codebase to Python 3.10 using pyupgrade

This commit is contained in:
Kovid Goyal
2025-01-10 22:31:41 +05:30
parent 922d08516b
commit da1626090a
126 changed files with 1739 additions and 1764 deletions

View File

@@ -5,9 +5,10 @@
import importlib
import os
import sys
from collections.abc import Callable, Generator
from contextlib import contextmanager
from functools import partial
from typing import TYPE_CHECKING, Any, Callable, Dict, FrozenSet, Generator, List, NamedTuple, Optional, Union, cast
from typing import TYPE_CHECKING, Any, NamedTuple, cast
from kitty.constants import list_kitty_resources
from kitty.types import run_once
@@ -49,7 +50,7 @@ class CLIOnlyKitten(TypeError):
super().__init__(f'The {kitten} kitten must be run only at the commandline, as: kitten {kitten}')
def import_kitten_main_module(config_dir: str, kitten: str) -> Dict[str, Any]:
def import_kitten_main_module(config_dir: str, kitten: str) -> dict[str, Any]:
if kitten.endswith('.py'):
with preserve_sys_path():
path = path_to_custom_kitten(config_dir, kitten)
@@ -76,15 +77,15 @@ def import_kitten_main_module(config_dir: str, kitten: str) -> Dict[str, Any]:
class KittenMetadata(NamedTuple):
handle_result: Callable[[Any, int, BossType], None] = lambda *a: None
type_of_input: Optional[str] = None
type_of_input: str | None = None
no_ui: bool = False
has_ready_notification: bool = False
open_url_handler: Optional[Callable[[BossType, WindowType, str, int, str], bool]] = None
open_url_handler: Callable[[BossType, WindowType, str, int, str], bool] | None = None
allow_remote_control: bool = False
remote_control_password: Union[str, bool] = False
remote_control_password: str | bool = False
def create_kitten_handler(kitten: str, orig_args: List[str]) -> KittenMetadata:
def create_kitten_handler(kitten: str, orig_args: list[str]) -> KittenMetadata:
from kitty.constants import config_dir
kitten = resolved_kitten(kitten)
m = import_kitten_main_module(config_dir, kitten)
@@ -107,7 +108,7 @@ def set_debug(kitten: str) -> None:
setattr(builtins, 'debug', debug)
def launch(args: List[str]) -> None:
def launch(args: list[str]) -> None:
config_dir, kitten = args[:2]
kitten = resolved_kitten(kitten)
del args[:2]
@@ -157,7 +158,7 @@ def run_kitten(kitten: str, run_name: str = '__main__') -> None:
@run_once
def all_kitten_names() -> FrozenSet[str]:
def all_kitten_names() -> frozenset[str]:
ans = []
for name in list_kitty_resources('kittens'):
if '__' not in name and '.' not in name and name != 'tui':
@@ -198,7 +199,7 @@ def get_kitten_completer(kitten: str) -> Any:
return ans
def get_kitten_conf_docs(kitten: str) -> Optional[Definition]:
def get_kitten_conf_docs(kitten: str) -> Definition | None:
setattr(sys, 'options_definition', None)
run_kitten(kitten, run_name='__conf__')
ans = getattr(sys, 'options_definition')
@@ -206,12 +207,12 @@ def get_kitten_conf_docs(kitten: str) -> Optional[Definition]:
return cast(Definition, ans)
def get_kitten_extra_cli_parsers(kitten: str) -> Dict[str,str]:
def get_kitten_extra_cli_parsers(kitten: str) -> dict[str,str]:
setattr(sys, 'extra_cli_parsers', {})
run_kitten(kitten, run_name='__extra_cli_parsers__')
ans = getattr(sys, 'extra_cli_parsers')
delattr(sys, 'extra_cli_parsers')
return cast(Dict[str, str], ans)
return cast(dict[str, str], ans)
def main() -> None: