From: Mauro Carvalho Chehab <mchehab@kernel.org>
To: Vegard Nossum <vegard.nossum@oracle.com>
Cc: Jonathan Corbet <corbet@lwn.net>,
Jani Nikula <jani.nikula@intel.com>,
linux-doc@vger.kernel.org
Subject: Re: [PATCH 4/8] doc: kernel_feat.py: convert to sphinx.util.logging
Date: Tue, 6 Feb 2024 05:42:21 +0100 [thread overview]
Message-ID: <20240206054221.429b1fd4@coco.lan> (raw)
In-Reply-To: <20240205175133.774271-5-vegard.nossum@oracle.com>
Em Mon, 5 Feb 2024 18:51:29 +0100
Vegard Nossum <vegard.nossum@oracle.com> escreveu:
> As of commit 3e893e16af55 ("docs: Raise the minimum Sphinx requirement
> to 2.4.4"), we can use Sphinx's built-in logging facilities.
>
> Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
> ---
> Documentation/sphinx/kernel_feat.py | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/sphinx/kernel_feat.py b/Documentation/sphinx/kernel_feat.py
> index 3493621d1a4e..f1c9e4a54964 100644
> --- a/Documentation/sphinx/kernel_feat.py
> +++ b/Documentation/sphinx/kernel_feat.py
> @@ -41,10 +41,13 @@ from docutils import nodes, statemachine
> from docutils.statemachine import ViewList
> from docutils.parsers.rst import directives, Directive
> from docutils.utils.error_reporting import ErrorString
> +from sphinx.util import logging
> from sphinx.util.docutils import switch_source_input
>
> __version__ = '1.0'
>
> +logger = logging.getLogger(__name__)
> +
> def setup(app):
>
> app.add_directive("kernel-feat", KernelFeat)
> @@ -67,12 +70,6 @@ class KernelFeat(Directive):
> "debug" : directives.flag
> }
>
> - def warn(self, message, **replace):
> - replace["fname"] = self.state.document.current_source
> - replace["line_no"] = replace.get("line_no", self.lineno)
> - message = ("%(fname)s:%(line_no)s: [kernel-feat WARN] : " + message) % replace
> - self.state.document.settings.env.app.warn(message, prefix="")
> -
That doesn't sound right.
If you remove the logic which gets the actual file name and line where
the error/warning have occurred, how are you handing now the special
output with such data produced by get_abi.pl to return the real file
name/line number where the error occurred?
Had you test changing an ABI file to cause a Sphinx warning and
ensured that the produced warning will report the actual location
of the warning, instead of shooting the messenger?
> def run(self):
> doc = self.state.document
> if not doc.settings.file_insertion_enabled:
Thanks,
Mauro
next prev parent reply other threads:[~2024-02-06 4:42 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-05 17:51 [PATCH 0/8] Sphinx extension fix + logging/warning cleanups Vegard Nossum
2024-02-05 17:51 ` [PATCH 1/8] docs: kernel_feat.py: fix build error for missing files Vegard Nossum
2024-02-06 4:30 ` Mauro Carvalho Chehab
2024-02-06 6:03 ` Salvatore Bonaccorso
2024-02-06 22:53 ` Jonathan Corbet
2024-02-07 2:57 ` Vegard Nossum
2024-02-07 14:42 ` Jonathan Corbet
2024-02-07 15:02 ` Vegard Nossum
2024-02-08 18:06 ` Jonathan Corbet
2024-02-05 17:51 ` [PATCH 2/8] docs: kernel_{abi,feat}.py: use doc.current_source Vegard Nossum
2024-02-06 8:49 ` Jani Nikula
2024-02-06 13:04 ` Vegard Nossum
2024-02-05 17:51 ` [PATCH 3/8] doc: kernel_abi.py: convert to sphinx.util.logging Vegard Nossum
2024-02-06 4:36 ` Mauro Carvalho Chehab
2024-02-05 17:51 ` [PATCH 4/8] doc: kernel_feat.py: " Vegard Nossum
2024-02-06 4:42 ` Mauro Carvalho Chehab [this message]
2024-02-06 12:38 ` Vegard Nossum
2024-02-05 17:51 ` [PATCH 5/8] doc: kerneldoc.py: " Vegard Nossum
2024-02-06 4:43 ` Mauro Carvalho Chehab
2024-02-05 17:51 ` [PATCH 6/8] doc: kfigure.py: " Vegard Nossum
2024-02-06 3:04 ` Akira Yokosawa
2024-02-06 12:40 ` Vegard Nossum
2024-02-06 4:49 ` Mauro Carvalho Chehab
2024-02-06 8:57 ` Jani Nikula
2024-02-06 13:12 ` Vegard Nossum
2024-02-06 14:00 ` Vegard Nossum
2024-02-06 16:08 ` Mauro Carvalho Chehab
2024-02-06 18:27 ` Jani Nikula
2024-02-05 17:51 ` [PATCH 7/8] doc: remove kernellog.py Vegard Nossum
2024-02-06 4:50 ` Mauro Carvalho Chehab
2024-02-05 17:51 ` [PATCH 8/8] doc: kernel_{abi,feat}.py: warn about missing directory Vegard Nossum
2024-02-06 4:53 ` Mauro Carvalho Chehab
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=20240206054221.429b1fd4@coco.lan \
--to=mchehab@kernel.org \
--cc=corbet@lwn.net \
--cc=jani.nikula@intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=vegard.nossum@oracle.com \
/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).