KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix type checking in send_text

Browse Source
This commit is contained in:
Kovid Goyal 2021-07-29 09:04:07 +05:30
parent d3d3e99979
commit f692d586f7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kitty/rc/send_text.py
View File

@ -5,16 +5,15 @@
import base64 import base64
import os import os
import sys import sys
from typing import TYPE_CHECKING, Dict, Generator, List, Optional from typing import TYPE_CHECKING, Dict, Generator, List, Optional, Union
from kitty.options.utils import parse_send_text_bytes
from kitty.key_encoding import decode_key_event_as_window_system_key
from kitty.fast_data_types import KeyEvent as WindowSystemKeyEvent from kitty.fast_data_types import KeyEvent as WindowSystemKeyEvent
from kitty.key_encoding import decode_key_event_as_window_system_key
from kitty.options.utils import parse_send_text_bytes
from .base import ( from .base import (
MATCH_TAB_OPTION, MATCH_WINDOW_OPTION, ArgsType, Boss, MatchError, MATCH_TAB_OPTION, MATCH_WINDOW_OPTION, ArgsType, Boss, MatchError,
PayloadGetType, PayloadType, RCOptions, RemoteCommand, ResponseType, PayloadGetType, PayloadType, RCOptions, RemoteCommand, ResponseType, Window
Window
) )
if TYPE_CHECKING: if TYPE_CHECKING:
@ -139,14 +138,18 @@ Do not send text to the active window, even if it is one of the matched windows.
raise MatchError(payload_get('match_tab'), 'tabs') raise MatchError(payload_get('match_tab'), 'tabs')
for tab in tabs: for tab in tabs:
windows += tuple(tab) windows += tuple(tab)
encoding, _, q = payload_get('data').partition(':') pdata: str = payload_get('data')
encoding, _, q = pdata.partition(':')
if encoding == 'text': if encoding == 'text':
data = q.encode('utf-8') data: Union[bytes, WindowSystemKeyEvent] = q.encode('utf-8')
elif encoding == 'base64': elif encoding == 'base64':
data = base64.standard_b64decode(q) data = base64.standard_b64decode(q)
elif encoding == 'kitty-key': elif encoding == 'kitty-key':
bdata = base64.standard_b64decode(q) bdata = base64.standard_b64decode(q)
data = decode_key_event_as_window_system_key(bdata.decode('ascii')) candidate = decode_key_event_as_window_system_key(bdata.decode('ascii'))
if candidate is None:
raise ValueError(f'Could not decode window system key: {q}')
data = candidate
else: else:
raise TypeError(f'Invalid encoding for send-text data: {encoding}') raise TypeError(f'Invalid encoding for send-text data: {encoding}')
exclude_active = payload_get('exclude_active') exclude_active = payload_get('exclude_active')