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

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

Revision: 1672
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1672&view=rev
Author:   edloper
Date:     2008-01-28 19:53:51 -0800 (Mon, 28 Jan 2008)

Log Message:
-----------
- Fixed sourceforge bug #1837874 -- fix_self_shadowing_var was setting
  canonical_name to a tuple by accident.
- Fixed typo introduced by previous svn checkin in _inherit_info()
- Made warning for introspector/parser disagreements about submodules
  a little prettier.

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

Modified: trunk/epydoc/src/epydoc/docbuilder.py
===================================================================
--- trunk/epydoc/src/epydoc/docbuilder.py	2008-01-29 02:55:49 UTC (rev 1671)
+++ trunk/epydoc/src/epydoc/docbuilder.py	2008-01-29 03:53:51 UTC (rev 1672)
@@ -1015,7 +1015,9 @@
     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))
+                    'for %s: (%s) vs (%s)' % (path,
+                                              ', '.join(str(n) for n in n1),
+                                              ', '.join(str(n) for n in n2)))
         return v1 + [m for m in v2 if m.canonical_name not in n1]
                 
     return v1
@@ -1184,7 +1186,7 @@
             return
 
     # If we couldn't find the actual value, use an unreachable name.
-    name = _unreachable_name_for(var_doc.value, docindex)
+    name, score = _unreachable_name_for(var_doc.value, docindex)
     log.warning('%s shadows itself -- using %s instead' % (varname, name))
     var_doc.value.canonical_name = name
 
@@ -1282,7 +1284,7 @@
     # If the new variable has a docstring, then don't inherit
     # anything, even if the docstring is blank.
     if var_doc.docstring not in (None, UNKNOWN):
-        inerited_attribs = set()
+        inherited_attribs = set()
     else:
         inherited_attribs = set(_INHERITED_ATTRIBS)
     


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