[Python-checkins] r65492 - doctools/trunk/sphinx/ext/autodoc.py

[georg.brandl]

Author: georg.brandl
Date: Mon Aug  4 17:57:34 2008
New Revision: 65492

Log:
Fix previous fix.


Modified:
   doctools/trunk/sphinx/ext/autodoc.py

Modified: doctools/trunk/sphinx/ext/autodoc.py
==============================================================================
--- doctools/trunk/sphinx/ext/autodoc.py	(original)
+++ doctools/trunk/sphinx/ext/autodoc.py	Mon Aug  4 17:57:34 2008
@@ -305,12 +305,13 @@
             if path:
                 mod_cls = path.rstrip('.')
             else:
+                mod_cls = None
                 # if documenting a class-level object without path, there must be a
                 # current class, either from a parent auto directive ...
                 if hasattr(self.env, 'autodoc_current_class'):
                     mod_cls = self.env.autodoc_current_class
                 # ... or from a class directive
-                else:
+                if mod_cls is None:
                     mod_cls = self.env.currclass
             mod, cls = rpartition(mod_cls, '.')
             # if the module name is still missing, get it like above