Merge pull request #603 from satra/fix/docbuild

doc: fixed building with Sphinx 1.2

Author: satra

doc/conf.py

@@ -36,7 +36,6 @@
               'sphinx.ext.doctest',
               'sphinx.ext.pngmath',
               'sphinx.ext.autosummary',
-              'inheritance_diagram',
               'numpy_ext.numpydoc',
               'matplotlib.sphinxext.plot_directive',
               'matplotlib.sphinxext.only_directives'

nipype/interfaces/base.py

@@ -711,7 +711,7 @@ def _get_trait_desc(self, inputs, name, spec):
             def_val = ''
             if getattr(spec, 'usedefault'):
                 def_arg = getattr(spec, 'default_value')()[1]
-                def_val = ', nipype default value: %s' % def_arg
+                def_val = ', nipype default value: %s' % str(def_arg)
             line = "(%s%s)" % (excp.info, def_val)
             manhelpstr = wrap(line, 70,
                               initial_indent=manhelpstr[0]+': ',