[Python-checkins] r62461 - in doctools/trunk/sphinx: environment.py ext/autodoc.py

[georg.brandl]

Author: georg.brandl
Date: Tue Apr 22 19:41:12 2008
New Revision: 62461

Log:
Ignore classes in conf.py.


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

Modified: doctools/trunk/sphinx/environment.py
==============================================================================
--- doctools/trunk/sphinx/environment.py	(original)
+++ doctools/trunk/sphinx/environment.py	Tue Apr 22 19:41:12 2008
@@ -181,7 +181,8 @@
         for key, val in vars(self.config).items():
             if key.startswith('_') or \
                    isinstance(val, types.ModuleType) or \
-                   isinstance(val, types.FunctionType):
+                   isinstance(val, types.FunctionType) or \
+                   isinstance(val, (type, types.ClassType)):
                 del self.config[key]
         try:
             pickle.dump(self, picklefile, pickle.HIGHEST_PROTOCOL)

Modified: doctools/trunk/sphinx/ext/autodoc.py
==============================================================================
--- doctools/trunk/sphinx/ext/autodoc.py	(original)
+++ doctools/trunk/sphinx/ext/autodoc.py	Tue Apr 22 19:41:12 2008
@@ -102,8 +102,8 @@
 
     if mod is None:
         warning = document.reporter.warning(
-            'don\'t know which module to import for documenting '
-            '%r (try placing a "module" directive in the document, '
+            'don\'t know which module to import for documenting %r '
+            '(try placing a "module" or "currentmodule" directive in the document, '
             'or giving an explicit module name)' % name, line=lineno)
         return [warning], result