diff --git a/kittens/ask/main.py b/kittens/ask/main.py index ea821dbfd..0ca73ff5f 100644 --- a/kittens/ask/main.py +++ b/kittens/ask/main.py @@ -3,7 +3,7 @@ import sys -from kitty.typing import BossType, TypedDict +from kitty.typing_compat import BossType, TypedDict from ..tui.handler import result_handler diff --git a/kittens/broadcast/main.py b/kittens/broadcast/main.py index f24abbef3..c76f54b0f 100644 --- a/kittens/broadcast/main.py +++ b/kittens/broadcast/main.py @@ -12,7 +12,7 @@ from kitty.key_encoding import encode_key_event from kitty.rc.base import MATCH_TAB_OPTION, MATCH_WINDOW_OPTION from kitty.remote_control import create_basic_command, encode_send from kitty.short_uuid import uuid4 -from kitty.typing import KeyEventType, ScreenSize +from kitty.typing_compat import KeyEventType, ScreenSize from ..tui.handler import Handler from ..tui.line_edit import LineEdit diff --git a/kittens/choose_fonts/backend.py b/kittens/choose_fonts/backend.py index 387bd16f2..c6db8e582 100644 --- a/kittens/choose_fonts/backend.py +++ b/kittens/choose_fonts/backend.py @@ -27,7 +27,7 @@ from kitty.fonts.list import create_family_groups from kitty.fonts.render import display_bitmap from kitty.options.types import Options from kitty.options.utils import parse_font_spec -from kitty.typing import NotRequired +from kitty.typing_compat import NotRequired from kitty.utils import screen_size_function if TYPE_CHECKING: diff --git a/kittens/hints/main.py b/kittens/hints/main.py index b655de616..fec4ebd00 100644 --- a/kittens/hints/main.py +++ b/kittens/hints/main.py @@ -10,7 +10,7 @@ from kitty.cli_stub import HintsCLIOptions from kitty.clipboard import set_clipboard_string, set_primary_selection from kitty.constants import website_url from kitty.fast_data_types import get_options -from kitty.typing import BossType, WindowType +from kitty.typing_compat import BossType, WindowType from kitty.utils import get_editor, resolve_custom_file from ..tui.handler import result_handler diff --git a/kittens/panel/main.py b/kittens/panel/main.py index e785de96d..e3d723308 100644 --- a/kittens/panel/main.py +++ b/kittens/panel/main.py @@ -31,7 +31,7 @@ from kitty.fast_data_types import ( from kitty.os_window_size import WindowSizeData, edge_spacing from kitty.simple_cli_definitions import listen_on_defn from kitty.types import LayerShellConfig -from kitty.typing import BossType, EdgeLiteral +from kitty.typing_compat import BossType, EdgeLiteral from kitty.utils import log_error quake = ( diff --git a/kittens/remote_file/main.py b/kittens/remote_file/main.py index 81958ce92..00ea465af 100644 --- a/kittens/remote_file/main.py +++ b/kittens/remote_file/main.py @@ -15,7 +15,7 @@ from typing import Any, Optional from kitty.cli import parse_args from kitty.cli_stub import RemoteFileCLIOptions from kitty.constants import cache_dir -from kitty.typing import BossType +from kitty.typing_compat import BossType from kitty.utils import SSHConnectionData, command_for_open, get_editor, open_cmd from ..tui.handler import result_handler diff --git a/kittens/runner.py b/kittens/runner.py index 2f97e5cf6..9678f2792 100644 --- a/kittens/runner.py +++ b/kittens/runner.py @@ -12,7 +12,7 @@ from typing import TYPE_CHECKING, Any, NamedTuple, cast from kitty.constants import list_kitty_resources from kitty.types import run_once -from kitty.typing import BossType, WindowType +from kitty.typing_compat import BossType, WindowType from kitty.utils import resolve_abs_or_config_path aliases = {'url_hints': 'hints'} diff --git a/kittens/transfer/rsync.pyi b/kittens/transfer/rsync.pyi index 8e79dea4c..9fac5b993 100644 --- a/kittens/transfer/rsync.pyi +++ b/kittens/transfer/rsync.pyi @@ -1,6 +1,6 @@ from typing import Callable, Union -from kitty.typing import ReadableBuffer, WriteableBuffer +from kitty.typing_compat import ReadableBuffer, WriteableBuffer class RsyncError(Exception): pass diff --git a/kittens/tui/handler.py b/kittens/tui/handler.py index 30f684b8c..c7a629fba 100644 --- a/kittens/tui/handler.py +++ b/kittens/tui/handler.py @@ -12,7 +12,7 @@ from typing import TYPE_CHECKING, Any, ContextManager, Deque, NamedTuple, Option from kitty.constants import kitten_exe, running_in_kitty from kitty.fast_data_types import monotonic, safe_pipe from kitty.types import DecoratedFunc, ParsedShortcut -from kitty.typing import ( +from kitty.typing_compat import ( AbstractEventLoop, BossType, Debug, diff --git a/kittens/tui/images.py b/kittens/tui/images.py index e3ef75a59..55f677727 100644 --- a/kittens/tui/images.py +++ b/kittens/tui/images.py @@ -14,7 +14,7 @@ from typing import Any, ClassVar, DefaultDict, Deque, Generic, Optional, TypeVar from kitty.conf.utils import positive_float, positive_int from kitty.fast_data_types import create_canvas -from kitty.typing import GRT_C, CompletedProcess, GRT_a, GRT_d, GRT_f, GRT_m, GRT_o, GRT_t, HandlerType +from kitty.typing_compat import GRT_C, CompletedProcess, GRT_a, GRT_d, GRT_f, GRT_m, GRT_o, GRT_t, HandlerType from kitty.utils import ScreenSize, fit_image, which from .operations import cursor diff --git a/kittens/tui/loop.py b/kittens/tui/loop.py index 9f9866f69..fb9a413ff 100644 --- a/kittens/tui/loop.py +++ b/kittens/tui/loop.py @@ -19,7 +19,7 @@ from typing import Any, NamedTuple from kitty.constants import is_macos from kitty.fast_data_types import FILE_TRANSFER_CODE, close_tty, normal_tty, open_tty, parse_input_from_terminal, raw_tty from kitty.key_encoding import ALT, CTRL, SHIFT, backspace_key, decode_key_event, enter_key -from kitty.typing import ImageManagerType, KeyEventType, Protocol +from kitty.typing_compat import ImageManagerType, KeyEventType, Protocol from kitty.utils import ScreenSize, ScreenSizeGetter, screen_size_function, write_all from .handler import Handler diff --git a/kittens/tui/operations.py b/kittens/tui/operations.py index 026e5be66..2b48f285c 100644 --- a/kittens/tui/operations.py +++ b/kittens/tui/operations.py @@ -11,7 +11,7 @@ from typing import Any, Optional, TypeVar, Union from kitty.fast_data_types import Color from kitty.rgb import color_as_sharp, to_color -from kitty.typing import GraphicsCommandType, HandlerType, ScreenSize, UnderlineLiteral +from kitty.typing_compat import GraphicsCommandType, HandlerType, ScreenSize, UnderlineLiteral from .operations_stub import CMD @@ -461,7 +461,7 @@ def func_sig(func: Callable[..., Any]) -> Generator[str, None, None]: def as_type_stub() -> str: ans = [ 'from typing import * # noqa', - 'from kitty.typing import GraphicsCommandType, ScreenSize', + 'from kitty.typing_compat import GraphicsCommandType, ScreenSize', 'from kitty.fast_data_types import Color', 'import kitty.rgb', 'import kittens.tui.operations', diff --git a/kittens/tui/spinners.py b/kittens/tui/spinners.py index 5b455c483..9e1faec20 100644 --- a/kittens/tui/spinners.py +++ b/kittens/tui/spinners.py @@ -4,7 +4,7 @@ from collections.abc import Sequence from kitty.fast_data_types import monotonic -from kitty.typing import TypedDict +from kitty.typing_compat import TypedDict class SpinnerDef(TypedDict): diff --git a/kittens/unicode_input/main.py b/kittens/unicode_input/main.py index 384acaa3e..1bce72770 100644 --- a/kittens/unicode_input/main.py +++ b/kittens/unicode_input/main.py @@ -2,7 +2,7 @@ # License: GPL v3 Copyright: 2018, Kovid Goyal -from kitty.typing import BossType +from kitty.typing_compat import BossType from ..tui.handler import result_handler diff --git a/kitty/borders.py b/kitty/borders.py index 9575308e5..3577c49b4 100644 --- a/kitty/borders.py +++ b/kitty/borders.py @@ -7,7 +7,7 @@ from typing import NamedTuple from .fast_data_types import BORDERS_PROGRAM, add_borders_rect, get_options, init_borders_program, os_window_has_background_image from .shaders import program_for -from .typing import LayoutType +from .typing_compat import LayoutType from .utils import color_as_int from .window_list import WindowGroup, WindowList diff --git a/kitty/boss.py b/kitty/boss.py index bc770ee91..a4c2bf4fe 100644 --- a/kitty/boss.py +++ b/kitty/boss.py @@ -123,7 +123,7 @@ from .session import Session, create_sessions, get_os_window_sizing_data from .shaders import load_shader_programs from .tabs import SpecialWindow, SpecialWindowInstance, Tab, TabDict, TabManager from .types import _T, AsyncResponse, LayerShellConfig, SingleInstanceData, WindowSystemMouseEvent, ac -from .typing import PopenType, TypedDict +from .typing_compat import PopenType, TypedDict from .utils import ( cleanup_ssh_control_masters, func_name, diff --git a/kitty/choose_entry.py b/kitty/choose_entry.py index d49f20de9..9d0cb6e5f 100644 --- a/kitty/choose_entry.py +++ b/kitty/choose_entry.py @@ -6,7 +6,7 @@ from collections.abc import Generator from typing import Any from .cli_stub import HintsCLIOptions -from .typing import MarkType +from .typing_compat import MarkType def mark(text: str, args: HintsCLIOptions, Mark: type[MarkType], extra_cli_args: list[str], *a: Any) -> Generator[MarkType, None, None]: diff --git a/kitty/cli.py b/kitty/cli.py index 7fa1c4777..9da5af29a 100644 --- a/kitty/cli.py +++ b/kitty/cli.py @@ -15,7 +15,7 @@ from .fast_data_types import parse_cli_from_spec, wcswidth from .options.types import Options as KittyOpts from .simple_cli_definitions import CompletionSpec, CompletionType, OptionDict, kitty_options_spec, serialize_as_go_string from .types import run_once -from .typing import BadLineType +from .typing_compat import BadLineType is_macos go_type_map = { diff --git a/kitty/colors.py b/kitty/colors.py index 1db4e524f..60f0f21c8 100644 --- a/kitty/colors.py +++ b/kitty/colors.py @@ -12,7 +12,7 @@ from .constants import config_dir from .fast_data_types import Color, get_boss, get_options, glfw_get_system_color_theme, patch_color_profiles, patch_global_colors, set_os_window_chrome from .options.types import Options, nullable_colors from .rgb import color_from_int -from .typing import WindowType +from .typing_compat import WindowType ColorsSpec = dict[str, Optional[int]] TransparentBackgroundColors = tuple[tuple[Color, float], ...] diff --git a/kitty/conf/utils.py b/kitty/conf/utils.py index 344f3865c..9cccec7dd 100644 --- a/kitty/conf/utils.py +++ b/kitty/conf/utils.py @@ -18,7 +18,7 @@ from ..constants import _plat, is_macos from ..fast_data_types import Color from ..rgb import to_color as as_color from ..types import ConvertibleToNumbers, ParsedShortcut, run_once -from ..typing import Protocol +from ..typing_compat import Protocol from ..utils import expandvars, log_error, shlex_split key_pat = re.compile(r'([a-zA-Z][a-zA-Z0-9_-]*)\s+(.+)$') diff --git a/kitty/config.py b/kitty/config.py index 2bdc12144..ddb0ad744 100644 --- a/kitty/config.py +++ b/kitty/config.py @@ -13,7 +13,7 @@ from .conf.utils import load_config as _load_config from .constants import cache_dir, defconf from .options.types import Options, defaults, option_names from .options.utils import KeyboardMode, KeyboardModeMap, KeyDefinition, MouseMap, MouseMapping, build_action_aliases -from .typing import TypedDict +from .typing_compat import TypedDict from .utils import log_error diff --git a/kitty/fast_data_types.pyi b/kitty/fast_data_types.pyi index 08708a1e9..cc6088f8d 100644 --- a/kitty/fast_data_types.pyi +++ b/kitty/fast_data_types.pyi @@ -9,7 +9,7 @@ from kitty.notifications import MacOSNotificationCategory from kitty.options.types import Options from kitty.simple_cli_definitions import OptionDict from kitty.types import LayerShellConfig, SignalInfo -from kitty.typing import EdgeLiteral, NotRequired, ReadableBuffer, WriteableBuffer +from kitty.typing_compat import EdgeLiteral, NotRequired, ReadableBuffer, WriteableBuffer # Constants {{{ SCALE_BITS: int diff --git a/kitty/file_transmission.py b/kitty/file_transmission.py index 499103c79..7e3c42ff8 100644 --- a/kitty/file_transmission.py +++ b/kitty/file_transmission.py @@ -24,7 +24,7 @@ from typing import IO, Any, DefaultDict, Deque, Union from kittens.transfer.utils import IdentityCompressor, ZlibCompressor, abspath, expand_home, home_path from kitty.fast_data_types import ESC_OSC, FILE_TRANSFER_CODE, AES256GCMDecrypt, add_timer, base64_decode, base64_encode, get_boss, get_options, monotonic from kitty.types import run_once -from kitty.typing import ReadableBuffer, WriteableBuffer +from kitty.typing_compat import ReadableBuffer, WriteableBuffer from .utils import log_error diff --git a/kitty/fonts/__init__.py b/kitty/fonts/__init__.py index a0141ea53..d1ff7afa1 100644 --- a/kitty/fonts/__init__.py +++ b/kitty/fonts/__init__.py @@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Literal, NamedTuple, TypedDict, TypeVar, Union from kitty.fast_data_types import ParsedFontFeature from kitty.types import run_once -from kitty.typing import CoreTextFont, FontConfigPattern +from kitty.typing_compat import CoreTextFont, FontConfigPattern from kitty.utils import shlex_split if TYPE_CHECKING: diff --git a/kitty/fonts/core_text.py b/kitty/fonts/core_text.py index 1424281ed..ed717f0f4 100644 --- a/kitty/fonts/core_text.py +++ b/kitty/fonts/core_text.py @@ -9,7 +9,7 @@ from functools import lru_cache from typing import NamedTuple from kitty.fast_data_types import CTFace, coretext_all_fonts -from kitty.typing import CoreTextFont +from kitty.typing_compat import CoreTextFont from kitty.utils import log_error from . import Descriptor, DescriptorVar, ListedFont, Score, Scorer, VariableData, family_name_to_key diff --git a/kitty/fonts/fontconfig.py b/kitty/fonts/fontconfig.py index 8b51fefd9..699b4127e 100644 --- a/kitty/fonts/fontconfig.py +++ b/kitty/fonts/fontconfig.py @@ -20,7 +20,7 @@ from kitty.fast_data_types import ( FC_WEIGHT_SEMIBOLD as FC_WEIGHT_BOLD, ) from kitty.fast_data_types import fc_match as fc_match_impl -from kitty.typing import FontConfigPattern +from kitty.typing_compat import FontConfigPattern from . import Descriptor, DescriptorVar, ListedFont, Score, Scorer, VariableData, family_name_to_key diff --git a/kitty/fonts/render.py b/kitty/fonts/render.py index d258fb8af..49220d94f 100644 --- a/kitty/fonts/render.py +++ b/kitty/fonts/render.py @@ -27,7 +27,7 @@ from kitty.fast_data_types import ( from kitty.options.types import Options, defaults from kitty.options.utils import parse_font_spec from kitty.types import _T -from kitty.typing import CoreTextFont, FontConfigPattern +from kitty.typing_compat import CoreTextFont, FontConfigPattern from kitty.utils import log_error from . import family_name_to_key diff --git a/kitty/keys.py b/kitty/keys.py index cccf4a617..65707f7c3 100644 --- a/kitty/keys.py +++ b/kitty/keys.py @@ -23,7 +23,7 @@ from .fast_data_types import ( ) from .options.types import Options from .options.utils import KeyboardMode, KeyDefinition, KeyMap -from .typing import ScreenType +from .typing_compat import ScreenType if TYPE_CHECKING: from .window import Window diff --git a/kitty/layout/base.py b/kitty/layout/base.py index 36743c02c..c1b812c94 100644 --- a/kitty/layout/base.py +++ b/kitty/layout/base.py @@ -10,7 +10,7 @@ from kitty.borders import BorderColor from kitty.fast_data_types import Region, set_active_window, viewport_for_window from kitty.options.types import Options from kitty.types import Edges, WindowGeometry -from kitty.typing import TypedDict, WindowType +from kitty.typing_compat import TypedDict, WindowType from kitty.window_list import WindowGroup, WindowList diff --git a/kitty/layout/grid.py b/kitty/layout/grid.py index 32cf0b38a..a41f82d2c 100644 --- a/kitty/layout/grid.py +++ b/kitty/layout/grid.py @@ -9,7 +9,7 @@ from typing import Any from kitty.borders import BorderColor from kitty.types import Edges -from kitty.typing import WindowType +from kitty.typing_compat import WindowType from kitty.window_list import WindowGroup, WindowList from .base import BorderLine, Layout, LayoutData, LayoutDimension, ListOfWindows, NeighborsMap, layout_dimension, lgd diff --git a/kitty/layout/splits.py b/kitty/layout/splits.py index 03dd0bf88..db20e6bb1 100644 --- a/kitty/layout/splits.py +++ b/kitty/layout/splits.py @@ -6,7 +6,7 @@ from typing import Any, NamedTuple, Optional, Union from kitty.borders import BorderColor from kitty.types import Edges, WindowGeometry -from kitty.typing import EdgeLiteral, WindowType +from kitty.typing_compat import EdgeLiteral, WindowType from kitty.window_list import WindowGroup, WindowList from .base import BorderLine, Layout, LayoutOpts, NeighborsMap, blank_rects_for_window, lgd, window_geometry_from_layouts diff --git a/kitty/layout/stack.py b/kitty/layout/stack.py index adce011fe..6c65a0dd1 100644 --- a/kitty/layout/stack.py +++ b/kitty/layout/stack.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # License: GPLv3 Copyright: 2020, Kovid Goyal -from kitty.typing import WindowType +from kitty.typing_compat import WindowType from kitty.window_list import WindowList from .base import Layout, NeighborsMap diff --git a/kitty/layout/tall.py b/kitty/layout/tall.py index bcec562cc..082f43a1d 100644 --- a/kitty/layout/tall.py +++ b/kitty/layout/tall.py @@ -8,7 +8,7 @@ from typing import Any from kitty.borders import BorderColor from kitty.conf.utils import to_bool from kitty.types import Edges -from kitty.typing import EdgeLiteral, WindowType +from kitty.typing_compat import EdgeLiteral, WindowType from kitty.window_list import WindowGroup, WindowList from .base import ( diff --git a/kitty/layout/vertical.py b/kitty/layout/vertical.py index 2a5f667eb..6671a8fee 100644 --- a/kitty/layout/vertical.py +++ b/kitty/layout/vertical.py @@ -6,7 +6,7 @@ from typing import Any from kitty.borders import BorderColor from kitty.types import Edges -from kitty.typing import WindowType +from kitty.typing_compat import WindowType from kitty.window_list import WindowGroup, WindowList from .base import BorderLine, Layout, LayoutData, LayoutDimension, NeighborsMap, lgd diff --git a/kitty/notifications.py b/kitty/notifications.py index 3c8be6adb..bd00be6f8 100644 --- a/kitty/notifications.py +++ b/kitty/notifications.py @@ -24,7 +24,7 @@ from .fast_data_types import ( os_window_is_invisible, ) from .types import run_once -from .typing import WindowType +from .typing_compat import WindowType from .utils import get_custom_window_icon, log_error, sanitize_control_codes debug_desktop_integration = False # set by NotificationManager diff --git a/kitty/open_actions.py b/kitty/open_actions.py index 17332fc55..4cb78ed4b 100644 --- a/kitty/open_actions.py +++ b/kitty/open_actions.py @@ -16,7 +16,7 @@ from .fast_data_types import get_options from .guess_mime_type import guess_type from .options.utils import ActionAlias, MapType, resolve_aliases_and_parse_actions from .types import run_once -from .typing import MatchType +from .typing_compat import MatchType from .utils import expandvars, get_editor, log_error, resolved_shell diff --git a/kitty/os_window_size.py b/kitty/os_window_size.py index 20f78145f..3d6aecf75 100644 --- a/kitty/os_window_size.py +++ b/kitty/os_window_size.py @@ -8,7 +8,7 @@ from .constants import is_macos, is_wayland from .fast_data_types import get_options from .options.types import Options from .types import FloatEdges -from .typing import EdgeLiteral +from .typing_compat import EdgeLiteral from .utils import log_error diff --git a/kitty/remote_control.py b/kitty/remote_control.py index 902b3749a..0a4d6363f 100644 --- a/kitty/remote_control.py +++ b/kitty/remote_control.py @@ -33,7 +33,7 @@ from .fast_data_types import ( ) from .rc.base import NoResponse, PayloadGetter, all_command_names, command_for_name from .types import AsyncResponse -from .typing import BossType, WindowType +from .typing_compat import BossType, WindowType from .utils import TTYIO, log_error, parse_address_spec, resolve_custom_file active_async_requests: dict[str, float] = {} diff --git a/kitty/session.py b/kitty/session.py index 7ebde0206..61ac6d574 100644 --- a/kitty/session.py +++ b/kitty/session.py @@ -14,7 +14,7 @@ from .layout.interface import all_layouts from .options.types import Options from .options.utils import resize_window, to_layout_names, window_size from .os_window_size import WindowSize, WindowSizeData, WindowSizes -from .typing import SpecialWindowInstance +from .typing_compat import SpecialWindowInstance from .utils import expandvars, log_error, resolve_custom_file, resolved_shell, shlex_split if TYPE_CHECKING: diff --git a/kitty/tab_bar.py b/kitty/tab_bar.py index 0c2c9970a..b54270ddd 100644 --- a/kitty/tab_bar.py +++ b/kitty/tab_bar.py @@ -31,7 +31,7 @@ from .fast_data_types import ( from .progress import ProgressState from .rgb import alpha_blend, color_as_sgr, color_from_int, to_color from .types import WindowGeometry, run_once -from .typing import EdgeLiteral, PowerlineStyle +from .typing_compat import EdgeLiteral, PowerlineStyle from .utils import color_as_int, log_error, sgr_sanitizer_pat diff --git a/kitty/tabs.py b/kitty/tabs.py index 413f83174..ed5013398 100644 --- a/kitty/tabs.py +++ b/kitty/tabs.py @@ -53,7 +53,7 @@ from .layout.interface import create_layout_object_for, evict_cached_layouts from .progress import ProgressState from .tab_bar import TabBar, TabBarData from .types import ac -from .typing import EdgeLiteral, SessionTab, SessionType, TypedDict +from .typing_compat import EdgeLiteral, SessionTab, SessionType, TypedDict from .utils import cmdline_for_hold, log_error, platform_window_id, resolved_shell, shlex_split, which from .window import CwdRequest, Watchers, Window, WindowDict from .window_list import WindowList diff --git a/kitty/typing.py b/kitty/typing_compat.py similarity index 100% rename from kitty/typing.py rename to kitty/typing_compat.py diff --git a/kitty/typing.pyi b/kitty/typing_compat.pyi similarity index 100% rename from kitty/typing.pyi rename to kitty/typing_compat.pyi diff --git a/kitty/utils.py b/kitty/utils.py index f3ee4fdb3..e8a32481a 100644 --- a/kitty/utils.py +++ b/kitty/utils.py @@ -33,7 +33,7 @@ from .constants import ( from .fast_data_types import WINDOW_FULLSCREEN, WINDOW_HIDDEN, WINDOW_MAXIMIZED, WINDOW_MINIMIZED, WINDOW_NORMAL, Color, Shlex, get_options, monotonic, open_tty from .fast_data_types import timed_debug_print as _timed_debug_print from .types import run_once -from .typing import AddressFamily, PopenType, StartupCtx +from .typing_compat import AddressFamily, PopenType, StartupCtx if TYPE_CHECKING: import tarfile diff --git a/kitty/window.py b/kitty/window.py index 9ff5cd6bd..16540e2c5 100644 --- a/kitty/window.py +++ b/kitty/window.py @@ -92,7 +92,7 @@ from .progress import Progress from .rgb import to_color from .terminfo import get_capabilities from .types import MouseEvent, OverlayType, WindowGeometry, ac, run_once -from .typing import BossType, ChildType, EdgeLiteral, TabType, TypedDict +from .typing_compat import BossType, ChildType, EdgeLiteral, TabType, TypedDict from .utils import ( color_as_int, docs_url, diff --git a/kitty/window_list.py b/kitty/window_list.py index beaf1d216..0c4055f7b 100644 --- a/kitty/window_list.py +++ b/kitty/window_list.py @@ -10,7 +10,7 @@ from typing import Any, Deque, Union from .fast_data_types import Color, get_options from .types import OverlayType, WindowGeometry -from .typing import EdgeLiteral, TabType, WindowType +from .typing_compat import EdgeLiteral, TabType, WindowType WindowOrId = Union[WindowType, int] group_id_counter = count(start=1)