Skip to content

Commit ff690ee

Browse files
Matthew WilcoxJonathan Corbet
authored andcommitted
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>
1 parent e675482 commit ff690ee

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Documentation/sphinx/kerneldoc.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636

3737
from docutils import nodes, statemachine
3838
from docutils.statemachine import ViewList
39-
from docutils.parsers.rst import directives
40-
from sphinx.util.compat import Directive
39+
from docutils.parsers.rst import directives, Directive
4140
from sphinx.ext.autodoc import AutodocReporter
4241

4342
__version__ = '1.0'

0 commit comments

Comments
 (0)