Replace isort with ruff

kittens/ssh/config.py

@@ -6,12 +6,12 @@ import fnmatch
 import os
 from typing import Any, Dict, Iterable, Optional
 
-from kitty.conf.utils import (
-    load_config as _load_config, parse_config_base, resolve_config
-)
+from kitty.conf.utils import load_config as _load_config
+from kitty.conf.utils import parse_config_base, resolve_config
 from kitty.constants import config_dir
 
-from .options.types import Options as SSHOptions, defaults
+from .options.types import Options as SSHOptions
+from .options.types import defaults
 
 SYSTEM_CONF = '/etc/xdg/kitty/ssh.conf'
 defconf = os.path.join(config_dir, 'ssh.conf')
@@ -28,12 +28,8 @@ def host_matches(mpat: str, hostname: str, username: str) -> bool:
 
 
 def load_config(*paths: str, overrides: Optional[Iterable[str]] = None, hostname: str = '!', username: str = '') -> SSHOptions:
-    from .options.parse import (
-        create_result_dict, merge_result_dicts, parse_conf_item
-    )
-    from .options.utils import (
-        first_seen_positions, get_per_hosts_dict, init_results_dict
-    )
+    from .options.parse import create_result_dict, merge_result_dicts, parse_conf_item
+    from .options.utils import first_seen_positions, get_per_hosts_dict, init_results_dict
 
     def merge_dicts(base: Dict[str, Any], vals: Dict[str, Any]) -> Dict[str, Any]:
         base_phd = get_per_hosts_dict(base)

kittens/ssh/copy.py

@@ -6,9 +6,7 @@ import glob
 import os
 import shlex
 import uuid
-from typing import (
-    Dict, Iterable, Iterator, List, NamedTuple, Optional, Sequence, Tuple
-)
+from typing import Dict, Iterable, Iterator, List, NamedTuple, Optional, Sequence, Tuple
 
 from kitty.cli import parse_args
 from kitty.cli_stub import CopyCLIOptions

kittens/ssh/main.py

@@ -22,27 +22,16 @@ from base64 import standard_b64decode, standard_b64encode
 from contextlib import contextmanager, suppress
 from getpass import getuser
 from select import select
-from typing import (
-    Any, Callable, Dict, Iterator, List, NoReturn, Optional, Sequence, Set,
-    Tuple, Union, cast
-)
+from typing import Any, Callable, Dict, Iterator, List, NoReturn, Optional, Sequence, Set, Tuple, Union, cast
 
-from kitty.constants import (
-    cache_dir, runtime_dir, shell_integration_dir, ssh_control_master_template,
-    str_version, terminfo_dir
-)
+from kitty.constants import cache_dir, runtime_dir, shell_integration_dir, ssh_control_master_template, str_version, terminfo_dir
 from kitty.shell_integration import as_str_literal
 from kitty.shm import SharedMemory
 from kitty.types import run_once
-from kitty.utils import (
-    SSHConnectionData, expandvars, resolve_abs_or_config_path,
-    set_echo as turn_off_echo
-)
+from kitty.utils import SSHConnectionData, expandvars, resolve_abs_or_config_path
+from kitty.utils import set_echo as turn_off_echo
 
-from ..tui.operations import (
-    RESTORE_PRIVATE_MODE_VALUES, SAVE_PRIVATE_MODE_VALUES, Mode,
-    restore_colors, save_colors, set_mode
-)
+from ..tui.operations import RESTORE_PRIVATE_MODE_VALUES, SAVE_PRIVATE_MODE_VALUES, Mode, restore_colors, save_colors, set_mode
 from ..tui.utils import kitty_opts, running_in_tmux
 from .config import init_config
 from .copy import CopyInstruction
@@ -624,9 +613,7 @@ def drain_potential_tty_garbage(p: 'subprocess.Popen[bytes]', data_request: str)
 def change_colors(color_scheme: str) -> bool:
     if not color_scheme:
         return False
-    from kittens.themes.collection import (
-        NoCacheFound, load_themes, text_as_opts
-    )
+    from kittens.themes.collection import NoCacheFound, load_themes, text_as_opts
     from kittens.themes.main import colors_as_escape_codes
     if color_scheme.endswith('.conf'):
         conf_file = resolve_abs_or_config_path(color_scheme)

kittens/ssh/options/definition.py

@@ -6,7 +6,6 @@
 
 from kitty.conf.types import Definition
 
-
 copy_message = '''\
 Copy files and directories from local to remote hosts. The specified files are
 assumed to be relative to the HOME directory and copied to the HOME on the

kittens/ssh/options/parse.py

@@ -1,6 +1,7 @@
 # generated by gen-config.py DO NOT edit
 
 import typing
+
 from kittens.ssh.options.utils import copy, env, hostname
 from kitty.conf.utils import merge_dicts, to_bool