shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[configTools] remove cached set and simplify checking option id

Browse Source
This commit is contained in:
Cosimo Lupo 2022-04-21 17:18:32 +01:00
parent e9bec87d1a
commit 7588062413
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/fontTools/misc/configTools.py
View File

@ -110,11 +110,9 @@ class Options(Mapping):
""" """
__options: Dict[str, Option] __options: Dict[str, Option]
__cache: Set[Option]
def __init__(self, other: "Options" = None) -> None: def __init__(self, other: "Options" = None) -> None:
self.__options = {} self.__options = {}
self.__cache = set()
if other is not None: if other is not None:
for option in other.values(): for option in other.values():
self.register_option(option) self.register_option(option)
@ -135,15 +133,12 @@ class Options(Mapping):
name = option.name name = option.name
if name in self.__options: if name in self.__options:
raise ConfigAlreadyRegisteredError(name) raise ConfigAlreadyRegisteredError(name)
# sanity check option values are unique
assert option not in self.__cache
self.__options[name] = option self.__options[name] = option
self.__cache.add(option)
return option return option
def is_registered(self, option: Option) -> bool: def is_registered(self, option: Option) -> bool:
"""Return True if the option object is already registered.""" """Return True if the same option object is already registered."""
return option in self.__cache return self.__options.get(option.name) is option
def __getitem__(self, key: str) -> Option: def __getitem__(self, key: str) -> Option:
return self.__options.__getitem__(key) return self.__options.__getitem__(key)