diff --git a/kittens/panel/main.py b/kittens/panel/main.py index 298ee0221..451239deb 100644 --- a/kittens/panel/main.py +++ b/kittens/panel/main.py @@ -3,11 +3,11 @@ import os import sys +from collections.abc import Iterable, Mapping, Sequence from contextlib import suppress from functools import partial from types import MappingProxyType from typing import Any -from collections.abc import Iterable, Mapping, Sequence from kitty.cli import parse_args from kitty.cli_stub import PanelCLIOptions diff --git a/kitty/child.py b/kitty/child.py index 77f436320..df0b929ce 100644 --- a/kitty/child.py +++ b/kitty/child.py @@ -5,12 +5,11 @@ import os import sys import termios from collections import defaultdict -from collections.abc import Generator, Sequence +from collections.abc import Generator, Iterable, Mapping, Sequence from contextlib import contextmanager, suppress from itertools import count from time import monotonic from typing import TYPE_CHECKING, DefaultDict, Optional, TypedDict -from collections.abc import Iterable, Mapping import kitty.fast_data_types as fast_data_types diff --git a/kitty/conf/types.py b/kitty/conf/types.py index b6cc74223..1a2710a21 100644 --- a/kitty/conf/types.py +++ b/kitty/conf/types.py @@ -5,12 +5,11 @@ import builtins import re import textwrap import typing -from collections.abc import Callable, Iterable, Iterator +from collections.abc import Callable, Iterable, Iterator, Sequence from functools import lru_cache from importlib import import_module from re import Match from typing import Any, Optional, Union, cast -from collections.abc import Sequence import kitty.conf.utils as generic_parsers from kitty.constants import website_url diff --git a/kitty/launch.py b/kitty/launch.py index e259238ad..bdfa6c119 100644 --- a/kitty/launch.py +++ b/kitty/launch.py @@ -4,10 +4,9 @@ import os import shutil -from collections.abc import Container, Iterable, Iterator, Sequence +from collections.abc import Callable, Container, Iterable, Iterator, Sequence from contextlib import suppress from typing import Any, Literal, NamedTuple, TypedDict -from collections.abc import Callable from .boss import Boss from .child import Child diff --git a/kitty/layout/base.py b/kitty/layout/base.py index 764e5d17f..6deb610d2 100644 --- a/kitty/layout/base.py +++ b/kitty/layout/base.py @@ -1,12 +1,11 @@ #!/usr/bin/env python # License: GPLv3 Copyright: 2020, Kovid Goyal -from collections.abc import Generator, Iterable, Iterator, Sequence +from collections.abc import Callable, Generator, Iterable, Iterator, Sequence from enum import Enum from functools import partial from itertools import repeat from typing import Any, ClassVar, NamedTuple -from collections.abc import Callable from kitty.borders import BorderColor from kitty.fast_data_types import BOTTOM_EDGE, RIGHT_EDGE, Region, get_options, set_active_window, viewport_for_window diff --git a/kitty/session.py b/kitty/session.py index a70c95ade..c2986303a 100644 --- a/kitty/session.py +++ b/kitty/session.py @@ -6,12 +6,11 @@ import os import re import shlex import sys -from collections.abc import Callable, Generator, Iterator, Mapping +from collections.abc import Callable, Generator, Iterator, Mapping, Sequence from contextlib import suppress from functools import partial from gettext import gettext as _ from typing import TYPE_CHECKING, Any, Optional, Union -from collections.abc import Sequence from .cli_stub import CLIOptions, GotoSessionOptions, SaveAsSessionOptions from .constants import config_dir, unserialize_launch_flag diff --git a/kitty/shell_integration.py b/kitty/shell_integration.py index c374d5000..6048b12d5 100644 --- a/kitty/shell_integration.py +++ b/kitty/shell_integration.py @@ -5,9 +5,8 @@ import os import re import subprocess -from collections.abc import Callable +from collections.abc import Callable, Iterable from contextlib import suppress -from collections.abc import Iterable from .constants import shell_integration_dir from .fast_data_types import get_options diff --git a/kitty/simple_cli_definitions.py b/kitty/simple_cli_definitions.py index f78012fb9..3bfddedd8 100644 --- a/kitty/simple_cli_definitions.py +++ b/kitty/simple_cli_definitions.py @@ -6,10 +6,10 @@ import re import sys +from collections.abc import Iterator, Sequence from enum import Enum, auto from functools import lru_cache from typing import Any, NamedTuple -from collections.abc import Iterator, Sequence if getattr(sys, 'running_from_setup', False): is_macos = 'darwin' in sys.platform.lower() diff --git a/kitty/window.py b/kitty/window.py index 02460d410..bde0daf1f 100644 --- a/kitty/window.py +++ b/kitty/window.py @@ -7,7 +7,7 @@ import re import sys import weakref from collections import deque -from collections.abc import Callable, Generator, Iterable, Sequence +from collections.abc import Callable, Generator, Iterable, Iterator, Sequence from contextlib import contextmanager, suppress from enum import Enum, IntEnum, auto from functools import lru_cache, partial @@ -24,7 +24,6 @@ from typing import ( Optional, Union, ) -from collections.abc import Iterator from .child import ProcessDesc from .cli_stub import CLIOptions, SaveAsSessionOptions diff --git a/kitty/window_list.py b/kitty/window_list.py index 30979d2d8..de0f8deab 100644 --- a/kitty/window_list.py +++ b/kitty/window_list.py @@ -3,11 +3,10 @@ import weakref from collections import deque -from collections.abc import Iterator +from collections.abc import Iterator, Sequence from contextlib import suppress from itertools import count from typing import Any, Deque, Union -from collections.abc import Sequence from .fast_data_types import Color, get_options from .types import OverlayType, WindowGeometry