mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-21 16:05:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: More f-string for kitty

Browse Source
This commit is contained in:
pagedown
2022-01-29 20:17:46 +08:00
parent 74e70d2548
commit ba0f61d752
18 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kitty/options/utils.py
View File

@@ -379,7 +379,7 @@ def parse_mods(parts: Iterable[str], sc: str) -> Optional[int]:
mods = 0
for m in parts:
try:
mods |= getattr(defines, 'GLFW_MOD_' + map_mod(m.upper()))
mods |= getattr(defines, f'GLFW_MOD_{map_mod(m.upper())}')
except AttributeError:
if m.upper() != 'NONE':
log_error(f'Shortcut: {sc} has unknown modifier, ignoring')
@@ -394,7 +394,7 @@ def to_modifiers(val: str) -> int:
def parse_shortcut(sc: str) -> SingleKey:
if sc.endswith('+') and len(sc) > 1:
sc = sc[:-1] + 'plus'
sc = f'{sc[:-1]}plus'
parts = sc.split('+')
mods = 0
if len(parts) > 1:
@@ -895,13 +895,13 @@ def resolve_aliases_and_parse_actions(
parts = rest.split(maxsplit=1)
if parts[0] != alias.name:
continue
new_defn = possible_alias + ' ' + alias.value + ((' ' + parts[1]) if len(parts) > 1 else '')
new_defn = f'{possible_alias} {alias.value} {f" {parts[1]}" if len(parts) > 1 else ""}'
new_aliases = aliases.copy()
new_aliases[possible_alias] = [a for a in aliases[possible_alias] if a is not alias]
yield from resolve_aliases_and_parse_actions(new_defn, new_aliases, map_type)
return
else: # action_alias
new_defn = alias.value + ((' ' + rest) if rest else '')
new_defn = f'{alias.value} {rest}' if rest else alias.value
new_aliases = aliases.copy()
new_aliases.pop(possible_alias)
yield from resolve_aliases_and_parse_actions(new_defn, new_aliases, map_type)
@@ -909,7 +909,7 @@ def resolve_aliases_and_parse_actions(
if possible_alias == 'combine':
sep, rest = rest.split(maxsplit=1)
parts = re.split(r'\s*' + re.escape(sep) + r'\s*', rest)
parts = re.split(fr'\s*{re.escape(sep)}\s*', rest)
for x in parts:
if x:
yield from resolve_aliases_and_parse_actions(x, aliases, map_type)