mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 22:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow using a non-toal dict to init Options objects

Browse Source
This commit is contained in:
Kovid Goyal
2021-08-04 17:06:50 +05:30
parent 7090c24321
commit e50c26d1b9
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kittens/diff/options/types.py generated
View File

@@ -72,8 +72,11 @@ class Options:
def __init__(self, options_dict: typing.Optional[typing.Dict[str, typing.Any]] = None) -> None: def __init__(self, options_dict: typing.Optional[typing.Dict[str, typing.Any]] = None) -> None:
if options_dict is not None: if options_dict is not None:
null = object()
for key in option_names: for key in option_names:
setattr(self, key, options_dict[key]) val = options_dict.get(key, null)
if val is not null:
setattr(self, key, val)
@property @property
def _fields(self) -> typing.Tuple[str, ...]: def _fields(self) -> typing.Tuple[str, ...]:

5
kitty/conf/generate.py
View File

@@ -185,8 +185,11 @@ def generate_class(defn: Definition, loc: str) -> Tuple[str, str]:
if defn.has_color_table: if defn.has_color_table:
a(' self.color_table = array(self.color_table.typecode, self.color_table)') a(' self.color_table = array(self.color_table.typecode, self.color_table)')
a(' if options_dict is not None:') a(' if options_dict is not None:')
a(' null = object()')
a(' for key in option_names:') a(' for key in option_names:')
a(' setattr(self, key, options_dict[key])') a(' val = options_dict.get(key, null)')
a(' if val is not null:')
a(' setattr(self, key, val)')
a('') a('')
a(' @property') a(' @property')

5
kitty/options/types.py generated
View File

@@ -608,8 +608,11 @@ class Options:
def __init__(self, options_dict: typing.Optional[typing.Dict[str, typing.Any]] = None) -> None: def __init__(self, options_dict: typing.Optional[typing.Dict[str, typing.Any]] = None) -> None:
self.color_table = array(self.color_table.typecode, self.color_table) self.color_table = array(self.color_table.typecode, self.color_table)
if options_dict is not None: if options_dict is not None:
null = object()
for key in option_names: for key in option_names:
setattr(self, key, options_dict[key]) val = options_dict.get(key, null)
if val is not null:
setattr(self, key, val)
@property @property
def _fields(self) -> typing.Tuple[str, ...]: def _fields(self) -> typing.Tuple[str, ...]: