releases/4.15.10/documentation-sphinx-fix-directive-import-error.patch

   1 From ff690eeed804f112242f9a0614eafdf559f9276a Mon Sep 17 00:00:00 2001
   2 From: Matthew Wilcox <mawilcox@microsoft.com>
   3 Date: Fri, 2 Mar 2018 10:40:14 -0800
   4 Subject: Documentation/sphinx: Fix Directive import error
   5
   6 From: Matthew Wilcox <mawilcox@microsoft.com>
   7
   8 commit ff690eeed804f112242f9a0614eafdf559f9276a upstream.
   9
  10 Sphinx 1.7 removed sphinx.util.compat.Directive so people
  11 who have upgraded cannot build the documentation.  Switch to
  12 docutils.parsers.rst.Directive which has been available since
  13 docutils 0.5 released in 2009.
  14
  15 Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=1083694
  16 Co-developed-by: Takashi Iwai <tiwai@suse.de>
  17 Acked-by: Jani Nikula <jani.nikula@intel.com>
  18 Cc: stable@vger.kernel.org
  19 Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
  20 Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  21 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  22
  23 ---
  24  Documentation/sphinx/kerneldoc.py |    3 +--
  25  1 file changed, 1 insertion(+), 2 deletions(-)
  26
  27 --- a/Documentation/sphinx/kerneldoc.py
  28 +++ b/Documentation/sphinx/kerneldoc.py
  29 @@ -36,8 +36,7 @@ import glob
  30
  31  from docutils import nodes, statemachine
  32  from docutils.statemachine import ViewList
  33 -from docutils.parsers.rst import directives
  34 -from sphinx.util.compat import Directive
  35 +from docutils.parsers.rst import directives, Directive
  36  from sphinx.ext.autodoc import AutodocReporter
  37
  38  __version__  = '1.0'