[Epydoc-commits] SF.net SVN: epydoc: [1471] trunk/epydoc/src/epydoc

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

Revision: 1471
          http://svn.sourceforge.net/epydoc/?rev=1471&view=rev
Author:   dvarrazzo
Date:     2007-02-13 06:27:23 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
- The parse representation is preferred if repr() returns a stock result,
  i.e. something like '<ClassName instance at 0x12345678>'.
- Using LaTeX package fancyhdr instead of the deprecated fancyheadings.
- Added missing escaping of LaTeX parameter default.
- Dropped parse_repr/pyval_repr check in HTML parameters default.

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

Modified: trunk/epydoc/src/epydoc/apidoc.py
===================================================================
--- trunk/epydoc/src/epydoc/apidoc.py	2007-02-13 14:16:22 UTC (rev 1470)
+++ trunk/epydoc/src/epydoc/apidoc.py	2007-02-13 14:27:23 UTC (rev 1471)
@@ -794,6 +794,9 @@
     UNKNOWN_REPR = "??"
     """@cvar: The string representation of an unknown value."""
 
+    STOCK_REPR = re.compile(r"(?i)^<.+\bat\b.+[0-9a-f]+.*>$")
+    """Match the return of repr() for object that didn't customize it."""
+    
     def pyval_repr(self):
         """Return a string representation of the python value.
 
@@ -812,6 +815,9 @@
         if rv is UNKNOWN:
             rv = self.parse_repr
 
+        elif self.STOCK_REPR.match(rv) and self.parse_repr is not UNKNOWN:
+            rv = self.parse_repr
+
         if rv is UNKNOWN:
             rv = self.UNKNOWN_REPR
 

Modified: trunk/epydoc/src/epydoc/docwriter/html.py
===================================================================
--- trunk/epydoc/src/epydoc/docwriter/html.py	2007-02-13 14:16:22 UTC (rev 1470)
+++ trunk/epydoc/src/epydoc/docwriter/html.py	2007-02-13 14:27:23 UTC (rev 1471)
@@ -2572,12 +2572,9 @@
         name = self._arg_name(name)
         s = '<span class="%s-arg">%s</span>' % (css_class, name)
         if default is not None:
-            if default.parse_repr is not UNKNOWN:
-                s += ('=<span class="%s-default">%s</span>' %
-                      (css_class, plaintext_to_html(default.parse_repr)))
-            else:
-                s += ('=<span class="%s-default">%s</span>' %
-                        (css_class, plaintext_to_html(default.pyval_repr())))
+            s += ('=<span class="%s-default">%s</span>' %
+                    (css_class, plaintext_to_html(
+                        default.summary_pyval_repr()[0])))
         return s
 
     def _arg_name(self, arg):

Modified: trunk/epydoc/src/epydoc/docwriter/latex.py
===================================================================
--- trunk/epydoc/src/epydoc/docwriter/latex.py	2007-02-13 14:16:22 UTC (rev 1470)
+++ trunk/epydoc/src/epydoc/docwriter/latex.py	2007-02-13 14:27:23 UTC (rev 1471)
@@ -27,7 +27,7 @@
 class LatexWriter:
     PREAMBLE = [
         "\\documentclass{article}",
-        "\\usepackage{alltt, parskip, fancyheadings, boxedminipage}",
+        "\\usepackage{alltt, parskip, fancyhdr, boxedminipage}",
         "\\usepackage{makeidx, multirow, longtable, tocbibind, amssymb}",
         "\\usepackage{fullpage}",
         "\\usepackage[usenames]{color}",
@@ -287,7 +287,7 @@
                 m = re.match(r'\\usepackage(\[.*?\])?{(.*?)}', line)
                 if m and m.group(2) in (
                     'babel', 'hyperref', 'color', 'alltt', 'parskip',
-                    'fancyheadings', 'boxedminipage', 'makeidx',
+                    'fancyhdr', 'boxedminipage', 'makeidx',
                     'multirow', 'longtable', 'tocbind', 'assymb',
                     'fullpage'):
                     pass
@@ -727,7 +727,8 @@
     def func_arg(self, name, default):
         s = '\\textit{%s}' % plaintext_to_latex(self._arg_name(name))
         if default is not None:
-            s += '=\\texttt{%s}' % default.summary_pyval_repr()[0]
+            s += '=\\texttt{%s}' % plaintext_to_latex(
+                default.summary_pyval_repr()[0])
         return s
     
     def _arg_name(self, arg):


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