masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix minor bug with required inherited settings in subclasses redefining them

Browse Source
This commit is contained in:
enkore 2015-06-08 02:32:39 +02:00
parent 362991ac66
commit 63c7cc6523
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
i3pystatus/core/settings.py
View File

@ -23,12 +23,18 @@ class SettingsBaseMeta(type):
name(setting) in seen or seen.add(name(setting)))] name(setting) in seen or seen.add(name(setting)))]
settings = tuple() settings = tuple()
required = tuple() required = set()
# getmro returns base classes according to Method Resolution Order, # getmro returns base classes according to Method Resolution Order,
# which always includes the class itself as the first element. # which always includes the class itself as the first element.
for base in inspect.getmro(cls): for base in inspect.getmro(cls):
settings += tuple(getattr(base, "settings", [])) settings += tuple(getattr(base, "settings", []))
required += tuple(getattr(base, "required", [])) required |= set(getattr(base, "required", []))
# if a derived class defines a default for a setting it is not
# required anymore.
for base in inspect.getmro(cls):
for r in list(required):
if hasattr(base, r):
required.remove(r)
return unique(settings), required return unique(settings), required