[Epydoc-commits] SF.net SVN: epydoc: [1723] trunk/epydoc/src/epydoc/docwriter/html.py

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

Revision: 1723
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1723&view=rev
Author:   edloper
Date:     2008-02-14 17:16:54 -0800 (Thu, 14 Feb 2008)

Log Message:
-----------
- If a class's metaclass is known, then show that class instead of
  'Class' on its class html page
- When displaying class description tables, don't bother with the
  'type' column -- it's always empty anyway.
- If a property's fget/fset/fdel function has the name '??', then
  don't bother to list it.

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/docwriter/html.py

Modified: trunk/epydoc/src/epydoc/docwriter/html.py
===================================================================
--- trunk/epydoc/src/epydoc/docwriter/html.py	2008-02-15 01:11:18 UTC (rev 1722)
+++ trunk/epydoc/src/epydoc/docwriter/html.py	2008-02-15 01:16:54 UTC (rev 1723)
@@ -842,7 +842,11 @@
         self.write_breadcrumbs(out, doc, self.url(doc))
 
         # Write the name of the class we're describing.
-        if doc.is_type(): typ = 'Type'
+        if (doc.metaclass is not UNKNOWN and
+                doc.metaclass.canonical_name is not UNKNOWN and 
+                doc.metaclass.canonical_name != 'type'):
+            typ = self.href(doc.metaclass, doc.metaclass.canonical_name[-1])
+        elif doc.is_type(): typ = 'Type'
         elif doc.is_exception(): typ = 'Exception'
         else: typ = 'Class'
         out('<!-- ==================== %s ' % typ.upper() +
@@ -2139,6 +2143,10 @@
                     var_doc.value.callgraph_uid = callgraph.uid
                 else:
                     callgraph = None
+        elif isinstance(var_doc.value, ClassDoc):
+            typ = -1 # use the whole row for description.
+            description = self.summary_name(var_doc,
+                link_name=link_name, anchor=anchor)
         else:
             typ = self.type_descr(var_doc, indent=6)
             description = self.summary_name(var_doc,
@@ -2171,6 +2179,9 @@
         # /------------------------- Template -------------------------\
         '''
           <tr$tr_class$>
+        >>> if typ == -1:
+            <td class="summary" colspan="2">
+        >>> else:
             <td width="15%" align="right" valign="top" class="summary">
               <span class="summary-type">$typ or "&nbsp;"$</span>
             </td><td class="summary">
@@ -2266,7 +2277,8 @@
                             [('Get', prop_doc.fget), ('Set', prop_doc.fset),
                              ('Delete', prop_doc.fdel)]
                             if val_doc not in (None, UNKNOWN)
-                            and val_doc.pyval is not None ]
+                            and val_doc.pyval is not None
+                            and not val_doc.canonical_name[0].startswith('??')]
 
             self.write_property_details_entry(out, var_doc, descr,
                                               accessors, div_class)


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