[Epydoc-commits] SF.net SVN: epydoc: [1810] trunk/epydoc/src/epydoc/docintrospecter.py

[<ed...@us...>]

Revision: 1810
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1810&view=rev
Author:   edloper
Date:     2008-03-30 20:22:51 -0700 (Sun, 30 Mar 2008)

Log Message:
-----------
- When introspecting the variables in a module, assume that all variables
  whose values are modules are imported.

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/docintrospecter.py

Modified: trunk/epydoc/src/epydoc/docintrospecter.py
===================================================================
--- trunk/epydoc/src/epydoc/docintrospecter.py	2008-03-05 18:40:49 UTC (rev 1809)
+++ trunk/epydoc/src/epydoc/docintrospecter.py	2008-03-31 03:22:51 UTC (rev 1810)
@@ -267,10 +267,11 @@
         # Create a VariableDoc for the child, and introspect its
         # value if it's defined in this module.
         container = get_containing_module(child)
-        if ((container is not None and
-             container == name_without_primes) or
-            (public_names is not None and
-             child_name in public_names)):
+        if (((container is not None and
+              container == name_without_primes) or
+             (public_names is not None and
+              child_name in public_names))
+            and not inspect.ismodule(child)):
             # Local variable.
             child_val_doc = introspect_docs(child, context=module_doc,
                                             module_name=dotted_name)
@@ -279,7 +280,8 @@
                                         is_imported=False,
                                         container=module_doc,
                                         docs_extracted_by='introspecter')
-        elif container is None or module_doc.canonical_name is UNKNOWN:
+        elif ((container is None or module_doc.canonical_name is UNKNOWN)
+              and not inspect.ismodule(child)):
 
             # Don't introspect stuff "from __future__"
             if is_future_feature(child): continue


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.