Sort frozenset literals in generated options class definition

This commit is contained in:
Kovid Goyal 2022-04-23 11:23:21 +05:30
parent 37cdaea9ed
commit 214631c2dd
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 6 additions and 2 deletions

View File

@ -125,7 +125,11 @@ def generate_class(defn: Definition, loc: str) -> Tuple[str, str]:
if func.__module__ != 'builtins': if func.__module__ != 'builtins':
tc_imports.add((func.__module__, func.__name__)) tc_imports.add((func.__module__, func.__name__))
defval = repr(func(option.defval_as_string)) defval_as_obj = func(option.defval_as_string)
if isinstance(defval_as_obj, frozenset):
defval = 'frozenset({' + ', '.join(repr(x) for x in sorted(defval_as_obj)) + '})'
else:
defval = repr(defval_as_obj)
if len(defval) > 100: if len(defval) > 100:
defval += ' # noqa' defval += ' # noqa'
if option.macos_defval is not unset: if option.macos_defval is not unset:

View File

@ -485,7 +485,7 @@ class Options:
click_interval: float = -1.0 click_interval: float = -1.0
clipboard_control: typing.Tuple[str, ...] = ('write-clipboard', 'write-primary', 'read-clipboard-ask', 'read-primary-ask') clipboard_control: typing.Tuple[str, ...] = ('write-clipboard', 'write-primary', 'read-clipboard-ask', 'read-primary-ask')
clipboard_max_size: float = 64.0 clipboard_max_size: float = 64.0
clone_source_strategies: typing.FrozenSet[str] = frozenset({'conda', 'env_var', 'venv', 'path'}) clone_source_strategies: typing.FrozenSet[str] = frozenset({'conda', 'env_var', 'path', 'venv'})
close_on_child_death: bool = False close_on_child_death: bool = False
command_on_bell: typing.List[str] = ['none'] command_on_bell: typing.List[str] = ['none']
confirm_os_window_close: int = -1 confirm_os_window_close: int = -1