summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <mawilcox@microsoft.com>2018-03-02 10:40:14 -0800
committerJonathan Corbet <corbet@lwn.net>2018-03-07 10:09:23 -0700
commit41387bb7d869e96df4b870e1880ad49f053cc755 (patch)
tree9cd10f6cd87cc9d98d4d539417ce9c8160af934d
parentc7899551ff3a999361e4270e99accc7fec408988 (diff)
downloadlinux-41387bb7d869e96df4b870e1880ad49f053cc755.tar.gz
linux-41387bb7d869e96df4b870e1880ad49f053cc755.tar.bz2
linux-41387bb7d869e96df4b870e1880ad49f053cc755.zip
Documentation/sphinx: Fix Directive import error
Sphinx 1.7 removed sphinx.util.compat.Directive so people who have upgraded cannot build the documentation. Switch to docutils.parsers.rst.Directive which has been available since docutils 0.5 released in 2009. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=1083694 Co-developed-by: Takashi Iwai <tiwai@suse.de> Acked-by: Jani Nikula <jani.nikula@intel.com> Cc: stable@vger.kernel.org Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--Documentation/sphinx/kerneldoc.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/sphinx/kerneldoc.py b/Documentation/sphinx/kerneldoc.py
index 39aa9e8697cc..fbedcc39460b 100644
--- a/Documentation/sphinx/kerneldoc.py
+++ b/Documentation/sphinx/kerneldoc.py
@@ -36,8 +36,7 @@ import glob
from docutils import nodes, statemachine
from docutils.statemachine import ViewList
-from docutils.parsers.rst import directives
-from sphinx.util.compat import Directive
+from docutils.parsers.rst import directives, Directive
from sphinx.ext.autodoc import AutodocReporter
__version__ = '1.0'