rename typing module to avoid conflicts with stdlib typing

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
 

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

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:

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

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 = (

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

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'}

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

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,

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

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

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',

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):

kittens/unicode_input/main.py

@@ -2,7 +2,7 @@
 # License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
 
 
-from kitty.typing import BossType
+from kitty.typing_compat import BossType
 
 from ..tui.handler import result_handler
 

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
 

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,

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]:

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 = {

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], ...]

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+(.+)$')

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
 
 

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

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
 

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:

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

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
 

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

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

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
 
 

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

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

kitty/layout/stack.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # License: GPLv3 Copyright: 2020, Kovid Goyal <kovid at kovidgoyal.net>
 
-from kitty.typing import WindowType
+from kitty.typing_compat import WindowType
 from kitty.window_list import WindowList
 
 from .base import Layout, NeighborsMap

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 (

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

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

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
 
 

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
 
 

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] = {}

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:

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
 
 

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

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

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,

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)