From: Takashi Iwai <tiwai@suse.de>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Jani Nikula <jani.nikula@intel.com>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] Documentation/sphinx: Fix Directive import error
Date: Fri, 02 Mar 2018 12:49:03 +0100 [thread overview]
Message-ID: <s5hbmg6hf4g.wl-tiwai@suse.de> (raw)
The sphinx.util.compat Directive stuff was deprecated in the recent
Sphinx version, and now we get a build error.
Let's take a fallback to the newer one, from docutils.parsers.rst.
Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=1083694
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
I'm no expert of sphinx nor python, so something might be wrong.
Please check it.
--- a/Documentation/sphinx/kerneldoc.py
+++ b/Documentation/sphinx/kerneldoc.py
@@ -37,7 +37,10 @@ import glob
from docutils import nodes, statemachine
from docutils.statemachine import ViewList
from docutils.parsers.rst import directives
-from sphinx.util.compat import Directive
+try:
+ from sphinx.util.compat import Directive
+except ImportError:
+ from docutils.parsers.rst import directives, Directive
from sphinx.ext.autodoc import AutodocReporter
__version__ = '1.0'
next reply other threads:[~2018-03-02 11:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 11:49 Takashi Iwai [this message]
2018-03-02 14:50 ` [PATCH] Documentation/sphinx: Fix Directive import error Matthew Wilcox
2018-03-02 14:55 ` Takashi Iwai
2018-03-02 15:17 ` Jonathan Corbet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5hbmg6hf4g.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=corbet@lwn.net \
--cc=jani.nikula@intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).