From 33c4172ee5c07c3546ef45068a633228da355512 Mon Sep 17 00:00:00 2001 From: enkore Date: Sat, 6 Jun 2015 12:49:25 +0200 Subject: [PATCH] Update module_docs to not manually merge inherited settings --- docs/module_docs.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/module_docs.py b/docs/module_docs.py index 3687728..5aff0eb 100644 --- a/docs/module_docs.py +++ b/docs/module_docs.py @@ -52,8 +52,7 @@ def process_docstring(app, what, name, obj, options, lines): self.doc = setting[1] else: self.name = setting - _, required = cls.get_merged_settings() - if self.name in required: + if self.name in cls.required: self.required = True elif hasattr(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("") - 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)