Merge pull request #3211 from takluyver/sphinx-xfileref-removed

Fix inheritance_diagram Sphinx extension for Sphinx 1.2

docs/sphinxext/inheritance_diagram.py

@@ -40,7 +40,9 b' except ImportError:'
 
 from docutils.nodes import Body, Element
 from docutils.parsers.rst import directives
-from sphinx.roles import xfileref_role
+from sphinx.roles import XRefRole
+
+xfileref_role = XRefRole()
 
 def my_import(name):
     """Module importer - taken from the python documentation.