mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-18 14:34:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Run pyupgrade to update the codebase to python 3.9

Browse Source 
Gets rid of a lot of typing ugliness by using type annotations on
builtin types
This commit is contained in:
Kovid Goyal
2024-07-31 07:55:27 +05:30
parent 3aac62f6c7
commit f1d0d0949b
48 changed files with 593 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
kitty/utils.py
View File

@@ -9,25 +9,17 @@ import os
import re
import string
import sys
from collections.abc import Generator, Iterable, Iterator, Mapping, Sequence
from contextlib import contextmanager, suppress
from functools import lru_cache
from re import Match, Pattern
from typing import (
TYPE_CHECKING,
Any,
BinaryIO,
Callable,
Dict,
Generator,
Iterable,
Iterator,
List,
Mapping,
Match,
NamedTuple,
Optional,
Pattern,
Sequence,
Tuple,
Union,
cast,
)
@@ -208,7 +200,7 @@ def screen_size_function(fd: Optional[int] = None) -> ScreenSizeGetter:
return ScreenSizeGetter(fd)
def fit_image(width: int, height: int, pwidth: int, pheight: int) -> Tuple[int, int]:
def fit_image(width: int, height: int, pwidth: int, pheight: int) -> tuple[int, int]:
from math import floor
if height > pheight:
corrf = pheight / float(height)
@@ -237,7 +229,7 @@ def base64_encode(
return ans
def command_for_open(program: Union[str, List[str]] = 'default') -> List[str]:
def command_for_open(program: Union[str, list[str]] = 'default') -> list[str]:
if isinstance(program, str):
from .conf.utils import to_cmdline
program = to_cmdline(program)
@@ -248,8 +240,8 @@ def command_for_open(program: Union[str, List[str]] = 'default') -> List[str]:
return cmd
def open_cmd(cmd: Union[Iterable[str], List[str]], arg: Union[None, Iterable[str], str] = None,
cwd: Optional[str] = None, extra_env: Optional[Dict[str, str]] = None) -> 'PopenType[bytes]':
def open_cmd(cmd: Union[Iterable[str], list[str]], arg: Union[None, Iterable[str], str] = None,
cwd: Optional[str] = None, extra_env: Optional[dict[str, str]] = None) -> 'PopenType[bytes]':
import subprocess
if arg is not None:
cmd = list(cmd)
@@ -257,7 +249,7 @@ def open_cmd(cmd: Union[Iterable[str], List[str]], arg: Union[None, Iterable[str
cmd.append(arg)
else:
cmd.extend(arg)
env: Optional[Dict[str, str]] = None
env: Optional[dict[str, str]] = None
if extra_env:
env = os.environ.copy()
env.update(extra_env)
@@ -266,7 +258,7 @@ def open_cmd(cmd: Union[Iterable[str], List[str]], arg: Union[None, Iterable[str
preexec_fn=clear_handled_signals, env=env)
def open_url(url: str, program: Union[str, List[str]] = 'default', cwd: Optional[str] = None, extra_env: Optional[Dict[str, str]] = None) -> 'PopenType[bytes]':
def open_url(url: str, program: Union[str, list[str]] = 'default', cwd: Optional[str] = None, extra_env: Optional[dict[str, str]] = None) -> 'PopenType[bytes]':
return open_cmd(command_for_open(program), url, cwd=cwd, extra_env=extra_env)
@@ -479,14 +471,14 @@ class SingleInstance:
single_instance = SingleInstance()
def parse_address_spec(spec: str) -> Tuple[AddressFamily, Union[Tuple[str, int], str], Optional[str]]:
def parse_address_spec(spec: str) -> tuple[AddressFamily, Union[tuple[str, int], str], Optional[str]]:
import socket
try:
protocol, rest = spec.split(':', 1)
except ValueError:
raise ValueError(f'Invalid listen-on value: {spec} must be of the form protocol:address')
socket_path = None
address: Union[str, Tuple[str, int]] = ''
address: Union[str, tuple[str, int]] = ''
if protocol == 'unix':
family = socket.AF_UNIX
address = rest
@@ -567,7 +559,7 @@ class TTYIO:
break
def set_echo(fd: int = -1, on: bool = False) -> Tuple[int, List[Union[int, List[Union[bytes, int]]]]]:
def set_echo(fd: int = -1, on: bool = False) -> tuple[int, list[Union[int, list[Union[bytes, int]]]]]:
import termios
if fd < 0:
fd = sys.stdin.fileno()
@@ -591,12 +583,12 @@ def no_echo(fd: int = -1) -> Iterator[None]:
termios.tcsetattr(fd, termios.TCSADRAIN, old)
def natsort_ints(iterable: Iterable[str]) -> List[str]:
def natsort_ints(iterable: Iterable[str]) -> list[str]:
def convert(text: str) -> Union[int, str]:
return int(text) if text.isdigit() else text
def alphanum_key(key: str) -> Tuple[Union[int, str], ...]:
def alphanum_key(key: str) -> tuple[Union[int, str], ...]:
return tuple(map(convert, re.split(r'(\d+)', key)))
return sorted(iterable, key=alphanum_key)
@@ -645,7 +637,7 @@ def get_editor_from_env(env: Mapping[str, str]) -> Optional[str]:
return None
def get_editor_from_env_vars(opts: Optional[Options] = None) -> List[str]:
def get_editor_from_env_vars(opts: Optional[Options] = None) -> list[str]:
editor = get_editor_from_env(os.environ)
if not editor:
shell_env = read_shell_environment(opts)
@@ -659,7 +651,7 @@ def get_editor_from_env_vars(opts: Optional[Options] = None) -> List[str]:
return list(shlex_split(ans))
def get_editor(opts: Optional[Options] = None, path_to_edit: str = '', line_number: int = 0) -> List[str]:
def get_editor(opts: Optional[Options] = None, path_to_edit: str = '', line_number: int = 0) -> list[str]:
if opts is None:
try:
opts = get_options()
@@ -745,7 +737,7 @@ def func_name(f: Any) -> str:
return str(f)
def resolved_shell(opts: Optional[Options] = None) -> List[str]:
def resolved_shell(opts: Optional[Options] = None) -> list[str]:
q: str = getattr(opts, 'shell', '.')
if q == '.':
ans = [shell_path]
@@ -767,7 +759,7 @@ def resolved_shell(opts: Optional[Options] = None) -> List[str]:
@run_once
def system_paths_on_macos() -> Tuple[str, ...]:
def system_paths_on_macos() -> tuple[str, ...]:
entries, seen = [], set()
def add_from_file(x: str) -> None:
@@ -849,8 +841,8 @@ def which(name: str, only_system: bool = False) -> Optional[str]:
return None
def read_shell_environment(opts: Optional[Options] = None) -> Dict[str, str]:
ans: Optional[Dict[str, str]] = getattr(read_shell_environment, 'ans', None)
def read_shell_environment(opts: Optional[Options] = None) -> dict[str, str]:
ans: Optional[dict[str, str]] = getattr(read_shell_environment, 'ans', None)
if ans is None:
from .child import openpty
ans = {}
@@ -935,12 +927,12 @@ class SSHConnectionData(NamedTuple):
hostname: str
port: Optional[int] = None
identity_file: str = ''
extra_args: Tuple[Tuple[str, str], ...] = ()
extra_args: tuple[tuple[str, str], ...] = ()
def get_new_os_window_size(
metrics: 'OSWindowSize', width: int, height: int, unit: str, incremental: bool = False, has_window_scaling: bool = True
) -> Tuple[int, int]:
) -> tuple[int, int]:
if unit == 'cells':
cw = metrics['cell_width']
ch = metrics['cell_height']
@@ -1045,7 +1037,7 @@ def path_from_osc7_url(url: Union[str, bytes]) -> str:
@run_once
def macos_version() -> Tuple[int, ...]:
def macos_version() -> tuple[int, ...]:
# platform.mac_ver does not work thanks to Apple's stupid "hardening", so just use sw_vers
import subprocess
try:
@@ -1169,7 +1161,7 @@ def is_png(path: str) -> bool:
return False
def cmdline_for_hold(cmd: Sequence[str] = (), opts: Optional['Options'] = None) -> List[str]:
def cmdline_for_hold(cmd: Sequence[str] = (), opts: Optional['Options'] = None) -> list[str]:
if opts is None:
with suppress(RuntimeError):
opts = get_options()
@@ -1189,7 +1181,7 @@ def safe_mtime(path: str) -> Optional[float]:
@run_once
def get_custom_window_icon() -> Union[Tuple[float, str], Tuple[None, None]]:
def get_custom_window_icon() -> Union[tuple[float, str], tuple[None, None]]:
filenames = ['kitty.app.png']
if is_macos:
# On macOS, prefer icns to png.
@@ -1202,7 +1194,7 @@ def get_custom_window_icon() -> Union[Tuple[float, str], Tuple[None, None]]:
return None, None
def key_val_matcher(items: Iterable[Tuple[str, str]], key_pat: 're.Pattern[str]', val_pat: Optional['re.Pattern[str]']) -> bool:
def key_val_matcher(items: Iterable[tuple[str, str]], key_pat: 're.Pattern[str]', val_pat: Optional['re.Pattern[str]']) -> bool:
for key, val in items:
if key_pat.search(key) is not None and (
val_pat is None or val_pat.search(val) is not None):
@@ -1216,7 +1208,7 @@ def shlex_split(text: str, allow_ansi_quoted_strings: bool = False) -> Iterator[
yield q[1]
def shlex_split_with_positions(text: str, allow_ansi_quoted_strings: bool = False) -> Iterator[Tuple[int, str]]:
def shlex_split_with_positions(text: str, allow_ansi_quoted_strings: bool = False) -> Iterator[tuple[int, str]]:
s = Shlex(text, allow_ansi_quoted_strings)
while (q := s.next_word())[0] > -1:
yield q