diff options
| author |   Matthew Wilcox <mawilcox@microsoft.com> | 2018-03-02 10:40:14 -0800 |
|---|---|---|
| committer |   Jonathan Corbet <corbet@lwn.net> | 2018-03-09 10:46:14 -0700 |
| commit | ff690eeed804f112242f9a0614eafdf559f9276a (patch) | |
| tree | 2fefd2e6ffd8737185866ad0179aefb8841b5d6a /Documentation/sphinx | |
| parent | Merge tag 'mips_fixes_4.16_4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips (diff) | |
| download | linux-dev-ff690eeed804f112242f9a0614eafdf559f9276a.tar.xz linux-dev-ff690eeed804f112242f9a0614eafdf559f9276a.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>
Diffstat (limited to 'Documentation/sphinx')
| -rw-r--r-- | Documentation/sphinx/kerneldoc.py | 3 |
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' |