[Epydoc-commits] SF.net SVN: epydoc: [1656] trunk/epydoc/src/epydoc/docbuilder.py

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

Revision: 1656
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1656&view=rev
Author:   edloper
Date:     2007-09-26 12:03:00 -0700 (Wed, 26 Sep 2007)

Log Message:
-----------
- If the parser & introspector disagree about submodules, then issue a
  warning, and merge the two lists.  It's still not clear *why* this
  might happen, but I suspect it might be the cause of a bug I'm
  investigating.

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

Modified: trunk/epydoc/src/epydoc/docbuilder.py
===================================================================
--- trunk/epydoc/src/epydoc/docbuilder.py	2007-09-26 18:44:11 UTC (rev 1655)
+++ trunk/epydoc/src/epydoc/docbuilder.py	2007-09-26 19:03:00 UTC (rev 1656)
@@ -1010,6 +1010,16 @@
 def merge_docs_extracted_by(v1, v2, precedence, cyclecheck, path):
     return 'both'
 
+def merge_submodules(v1, v2, precedence, cyclecheck, path):
+    n1 = sorted([m.canonical_name for m in v1])
+    n2 = sorted([m.canonical_name for m in v2])
+    if (n1 != n2) and (n2 != []):
+        log.warning('Introspector & parser disagree about submodules '
+                    'for %s: %s vs %s' % (path, n1, n2))
+        return v1 + [m for m in v2 if m.canonical_name not in n1]
+                
+    return v1
+
 register_attribute_mergefunc('variables', merge_variables)
 register_attribute_mergefunc('value', merge_value)
 register_attribute_mergefunc('overrides', merge_overrides)
@@ -1021,6 +1031,7 @@
 register_attribute_mergefunc('posarg_defaults', merge_posarg_defaults)
 register_attribute_mergefunc('docstring', merge_docstring)
 register_attribute_mergefunc('docs_extracted_by', merge_docs_extracted_by)
+register_attribute_mergefunc('submodules', merge_submodules)
 
 ######################################################################
 ## Import Linking


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