RF: Use docutils 0.5-style directive definition

Author: effigies

nipype/sphinxext/plot_workflow.py

@@ -118,7 +118,7 @@
 
 missing_imports = []
 try:
-    from docutils.parsers.rst import directives
+    from docutils.parsers.rst import directives, Directive
     from docutils.parsers.rst.directives.images import Image
 
     align = Image.align
@@ -146,26 +146,6 @@ def format_template(template, **kw):
         missing_imports.append(str(e))
 
 
-def wf_directive(
-    name,
-    arguments,
-    options,
-    content,
-    lineno,
-    content_offset,
-    block_text,
-    state,
-    state_machine,
-):
-    if len(missing_imports) == 0:
-        return run(arguments, content, options, state_machine, state, lineno)
-    else:
-        raise ImportError("\n".join(missing_imports))
-
-
-wf_directive.__doc__ = __doc__
-
-
 def _option_boolean(arg):
     if not arg or not arg.strip():
         # no argument given, assume used as a flag
@@ -232,12 +212,12 @@ def mark_wf_labels(app, document):
                     break
 
 
-def setup(app):
-    setup.app = app
-    setup.config = app.config
-    setup.confdir = app.confdir
-
-    options = {
+class WorkflowDirective(Directive):
+    has_content = True
+    required_arguments = 0
+    optional_arguments = 2
+    final_argument_whitespace = False
+    option_spec = {
         "alt": directives.unchanged,
         "height": directives.length_or_unitless,
         "width": directives.length_or_percentage_or_unitless,
@@ -253,7 +233,16 @@ def setup(app):
         "simple_form": _option_boolean,
     }
 
-    app.add_directive("workflow", wf_directive, True, (0, 2, False), **options)
+
+WorkflowDirective.__doc__ = __doc__
+
+
+def setup(app):
+    setup.app = app
+    setup.config = app.config
+    setup.confdir = app.confdir
+
+    app.add_directive("workflow", WorkflowDirective)
     app.add_config_value("graph2use", "hierarchical", "html")
     app.add_config_value("simple_form", True, "html")
     app.add_config_value("wf_pre_code", None, True)