lkml.org 
[lkml]   [2018]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 050/146] Documentation/sphinx: Fix Directive import error
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Matthew Wilcox <mawilcox@microsoft.com>

    commit ff690eeed804f112242f9a0614eafdf559f9276a upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    Documentation/sphinx/kerneldoc.py | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- 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'

    \
     
     \ /
      Last update: 2018-03-13 17:53    [W:3.942 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site