[Python-checkins] r64803 - in doctools/branches/0.4.x: CHANGES sphinx/ext/autodoc.py

[georg.brandl]

Author: georg.brandl
Date: Tue Jul  8 20:46:49 2008
New Revision: 64803

Log:
Accept class options for modules too.


Modified:
   doctools/branches/0.4.x/CHANGES
   doctools/branches/0.4.x/sphinx/ext/autodoc.py

Modified: doctools/branches/0.4.x/CHANGES
==============================================================================
--- doctools/branches/0.4.x/CHANGES	(original)
+++ doctools/branches/0.4.x/CHANGES	Tue Jul  8 20:46:49 2008
@@ -4,6 +4,9 @@
 * The JavaScript search now uses the correct file name suffix when
   referring to found items.
 
+* The automodule directive now accepts the ``inherited-members``
+  and ``show-inheritance`` options again.
+
 
 Release 0.4.1 (Jul 5, 2008)
 ===========================

Modified: doctools/branches/0.4.x/sphinx/ext/autodoc.py
==============================================================================
--- doctools/branches/0.4.x/sphinx/ext/autodoc.py	(original)
+++ doctools/branches/0.4.x/sphinx/ext/autodoc.py	Tue Jul  8 20:46:49 2008
@@ -548,7 +548,8 @@
 
 def setup(app):
     mod_options = {'members': members_option, 'undoc-members': directives.flag,
-                   'noindex': directives.flag}
+                   'noindex': directives.flag, 'inherited-members': directives.flag,
+                   'show-inheritance': directives.flag}
     cls_options = {'members': members_option, 'undoc-members': directives.flag,
                    'noindex': directives.flag, 'inherited-members': directives.flag,
                    'show-inheritance': directives.flag}