merge with trunk

1 files changed, 7 insertions, 4 deletions

diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index 2b280d673..705853c20 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -14,8 +14,7 @@
 import re
 import sys
 import inspect
-from types import ModuleType, FunctionType, BuiltinFunctionType, MethodType, \
-     ClassType
+from types import FunctionType, BuiltinFunctionType, MethodType, ClassType
 
 from docutils import nodes
 from docutils.utils import assemble_option_dict
@@ -626,11 +625,15 @@ class Documenter(object):
         # try to also get a source code analyzer for attribute docs
         try:
             self.analyzer = ModuleAnalyzer.for_module(self.real_modname)
-            # parse right now, to get PycodeErrors on parsing
-            self.analyzer.parse()
+            # parse right now, to get PycodeErrors on parsing (results will
+            # be cached anyway)
+            self.analyzer.find_attr_docs()
         except PycodeError, err:
             # no source file -- e.g. for builtin and C modules
             self.analyzer = None
+            # at least add the module.__file__ as a dependency
+            if hasattr(self.module, '__file__') and self.module.__file__:
+                self.directive.filename_set.add(self.module.__file__)
         else:
             self.directive.filename_set.add(self.analyzer.srcname)