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

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

Revision: 1299
Author:   edloper
Date:     2006-08-22 19:04:55 -0700 (Tue, 22 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/epydoc/?rev=1299&view=rev

Log Message:
-----------
- Fixed bug in unreachable name handling introduced by previous commit
  (1298).

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/docbuilder.py
Modified: trunk/epydoc/src/epydoc/docbuilder.py
===================================================================
--- trunk/epydoc/src/epydoc/docbuilder.py	2006-08-23 00:21:43 UTC (rev 1298)
+++ trunk/epydoc/src/epydoc/docbuilder.py	2006-08-23 02:04:55 UTC (rev 1299)
@@ -952,13 +952,13 @@
 L{assign_canonical_names()} finds a canonical name with a better
 score, then it will replace the old name."""
 
-_unreachable_names = {DottedName(DottedName.UNREACHABLE):2}
+_unreachable_names = {DottedName(DottedName.UNREACHABLE):1}
 """The set of names that have been used for unreachable objects.  This
 is used to ensure there are no duplicate cannonical names assigned.
 C{_unreachable_names} is a dictionary mapping from dotted names to
 integer ids, where the next unused unreachable name derived from
 dotted name C{n} is
-C{DottedName('%s-%s' % (n, str(_unreachable_names[n]))}"""
+C{DottedName('%s-%s' % (n, str(_unreachable_names[n]+1))}"""
 
 def assign_canonical_names(val_doc, name, docindex, score=0):
     """
@@ -1074,10 +1074,10 @@
 
     # Uniquify the name.
     if name in _unreachable_names:
-        name = DottedName('%s-%s' % (name, _unreachable_names[name]))
         _unreachable_names[name] += 1
+        name = DottedName('%s-%s' % (name, _unreachable_names[name]-1))
     else:
-        _unreachable_names[name] = 2
+        _unreachable_names[name] = 1
     
     return name, -10000
 


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