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

Update module_docs to not manually merge inherited settings

Browse Source
This commit is contained in:
enkore 2015-06-06 12:49:25 +02:00
parent 41003ef702
commit 33c4172ee5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/module_docs.py
View File

@ -52,8 +52,7 @@ def process_docstring(app, what, name, obj, options, lines):
self.doc = setting[1] self.doc = setting[1]
else: else:
self.name = setting self.name = setting
_, required = cls.get_merged_settings() if self.name in cls.required:
if self.name in required:
self.required = True self.required = True
elif hasattr(cls, self.name): elif hasattr(cls, self.name):
default = getattr(cls, self.name) default = getattr(cls, self.name)
@ -84,7 +83,7 @@ def process_docstring(app, what, name, obj, options, lines):
lines.append(".. rubric:: Settings") lines.append(".. rubric:: Settings")
lines.append("") lines.append("")
settings = [Setting(obj, setting) for setting in obj.get_merged_settings()[0]] settings = [Setting(obj, setting) for setting in obj.settings]
lines += map(str, settings) lines += map(str, settings)