[Epydoc-commits] SF.net SVN: epydoc: [1423] trunk/epydoc/src/epydoc/markup/restructuredtext. py

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

Revision: 1423
          http://svn.sourceforge.net/epydoc/?rev=1423&view=rev
Author:   dvarrazzo
Date:     2007-01-28 12:14:50 -0800 (Sun, 28 Jan 2007)

Log Message:
-----------
- dotgraph directives work again.
  they were broken probably after the docutils r4667 checkin, where some
  assertions about directives return values were added.
  Tested against docutils snapshot 2007-01-28, r4897

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/markup/restructuredtext.py

Modified: trunk/epydoc/src/epydoc/markup/restructuredtext.py
===================================================================
--- trunk/epydoc/src/epydoc/markup/restructuredtext.py	2007-01-28 15:31:10 UTC (rev 1422)
+++ trunk/epydoc/src/epydoc/markup/restructuredtext.py	2007-01-28 20:14:50 UTC (rev 1423)
@@ -669,8 +669,8 @@
     """
     if arguments: title = arguments[0]
     else: title = ''
-    return dotgraph(_construct_digraph, title, options.get('caption'),
-                    '\n'.join(content))
+    return [ dotgraph(_construct_digraph, title, options.get('caption'),
+                    '\n'.join(content)) ]
 digraph_directive.arguments = (0, 1, True)
 digraph_directive.options = {'caption': directives.unchanged}
 digraph_directive.content = True
@@ -698,7 +698,7 @@
       - C{:dir:} -- Specifies the orientation of the graph.  One of
         C{down}, C{right} (default), C{left}, C{up}.
     """
-    return dotgraph(_construct_classtree, arguments, options)
+    return [ dotgraph(_construct_classtree, arguments, options) ]
 classtree_directive.arguments = (0, 1, True)
 classtree_directive.options = {'dir': _dir_option}
 classtree_directive.content = False
@@ -734,7 +734,7 @@
       - C{:dir:} -- Specifies the orientation of the graph.  One of
         C{down}, C{right} (default), C{left}, C{up}.
     """
-    return dotgraph(_construct_packagetree, arguments, options)
+    return [ dotgraph(_construct_packagetree, arguments, options) ]
 packagetree_directive.arguments = (0, 1, True)
 packagetree_directive.options = {
   'dir': _dir_option,
@@ -759,8 +759,7 @@
 
 def importgraph_directive(name, arguments, options, content, lineno,
                         content_offset, block_text, state, state_machine):
-    return dotgraph(_construct_importgraph, arguments, options)
-importgraph_directive.arguments = None
+    return [ dotgraph(_construct_importgraph, arguments, options) ]
 importgraph_directive.options = {'dir': _dir_option}
 importgraph_directive.content = False
 directives.register_directive('importgraph', importgraph_directive)
@@ -772,7 +771,7 @@
 
 def callgraph_directive(name, arguments, options, content, lineno,
                         content_offset, block_text, state, state_machine):
-    return dotgraph(_construct_callgraph, arguments, options)
+    return [ dotgraph(_construct_callgraph, arguments, options) ]
 callgraph_directive.arguments = (0, 1, True)
 callgraph_directive.options = {'dir': _dir_option,
                                  'add_callers': directives.flag,


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