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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2018-04-27 11:19:46 +05:30
parent 2e693c31df
commit 54438cae3f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kitty/cli.py
View File

@ -500,7 +500,7 @@ def parse_args(args=None, ospec=options_spec, usage=None, message=None, appname=
SYSTEM_CONF = '/etc/xdg/kitty/kitty.conf' SYSTEM_CONF = '/etc/xdg/kitty/kitty.conf'
def print_shortcut(key_or_sequence, action): def print_shortcut(key_sequence, action):
if not getattr(print_shortcut, 'maps', None): if not getattr(print_shortcut, 'maps', None):
from kitty.keys import defines from kitty.keys import defines
v = vars(defines) v = vars(defines)
@ -510,9 +510,7 @@ def print_shortcut(key_or_sequence, action):
print_shortcut.maps = mmap, krmap print_shortcut.maps = mmap, krmap
mmap, krmap = print_shortcut.maps mmap, krmap = print_shortcut.maps
keys = [] keys = []
if isinstance(key_or_sequence[0], int): for key in key_sequence:
key_or_sequence = (key_or_sequence,)
for key in key_or_sequence:
names = [] names = []
mods, key = key mods, key = key
for name, val in mmap.items(): for name, val in mmap.items():
@ -529,12 +527,7 @@ def print_shortcut_changes(defns, text, changes):
if changes: if changes:
print(title(text)) print(title(text))
def k(x): for k in sorted(changes):
if isinstance(x[0], int):
x = (x,)
return x
for k in sorted(changes, key=k):
print_shortcut(k, defns[k]) print_shortcut(k, defns[k])
@ -566,6 +559,8 @@ def compare_opts(opts):
print(title('{:20s}'.format(f)), getattr(opts, f)) print(title('{:20s}'.format(f)), getattr(opts, f))
final, initial = opts.keymap, default_opts.keymap final, initial = opts.keymap, default_opts.keymap
final = {(k,): v for k, v in final.items()}
initial = {(k,): v for k, v in initial.items()}
final_s, initial_s = map(flatten_sequence_map, (opts.sequence_map, default_opts.sequence_map)) final_s, initial_s = map(flatten_sequence_map, (opts.sequence_map, default_opts.sequence_map))
final.update(final_s) final.update(final_s)
initial.update(initial_s) initial.update(initial_s)