[Epydoc-commits] SF.net SVN: epydoc: [1376] branches/exp-args_in_class

[<dva...@us...>]

Revision: 1376
          http://svn.sourceforge.net/epydoc/?rev=1376&view=rev
Author:   dvarrazzo
Date:     2006-09-08 13:53:48 -0700 (Fri, 08 Sep 2006)

Log Message:
-----------
Merged revisions 1371-1375 via svnmerge from 
https://svn.sourceforge.net/svnroot/epydoc/trunk

........
  r1375 | dvarrazzo | 2006-09-08 22:39:09 +0200 (Fri, 08 Sep 2006) | 2 lines
  
  - Dropped use of sort_by_name keyword in DocIndex.reachable_valdoc()
........

Modified Paths:
--------------
    branches/exp-args_in_class/epydoc/src/epydoc/docbuilder.py

Property Changed:
----------------
    branches/exp-args_in_class/


Property changes on: branches/exp-args_in_class
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-1370
   + /trunk:1-1375

Modified: branches/exp-args_in_class/epydoc/src/epydoc/docbuilder.py
===================================================================
--- branches/exp-args_in_class/epydoc/src/epydoc/docbuilder.py	2006-09-08 20:39:09 UTC (rev 1375)
+++ branches/exp-args_in_class/epydoc/src/epydoc/docbuilder.py	2006-09-08 20:53:48 UTC (rev 1376)
@@ -162,9 +162,8 @@
     # their targets.
     if parse:
         log.start_progress('Linking imported variables')
-        valdocs = docindex.reachable_valdocs(sort_by_name=True, imports=False,
-                                             submodules=False, packages=False,
-                                             subclasses=False)
+        valdocs = sorted(docindex.reachable_valdocs(
+            imports=False, submodules=False, packages=False, subclasses=False))
         for i, val_doc in enumerate(valdocs):
             _report_valdoc_progress(i, val_doc, valdocs)
             link_imports(val_doc, docindex)
@@ -179,13 +178,12 @@
 
     # Parse the docstrings for each object.
     log.start_progress('Parsing docstrings')
-    valdocs = docindex.reachable_valdocs(sort_by_name=True, imports=False,
-                                         submodules=False, packages=False,
-                                         subclasses=False)
-    # Sort according to dotted name, so __init__ docstrings are parsed after
+    # Sorting here is important to parse __init__ docstrings after matching
     # class docstrings, allowing constructor parameters to be specified in the
     # latters
-    for i, val_doc in enumerate(sorted(valdocs)):
+    valdocs = sorted(docindex.reachable_valdocs(
+        imports=False, submodules=False, packages=False, subclasses=False))
+    for i, val_doc in enumerate(valdocs):
         _report_valdoc_progress(i, val_doc, valdocs)
         # the value's docstring
         parse_docstring(val_doc, docindex)


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