Commit 0e0bdcea authored by Jonathan Corbet's avatar Jonathan Corbet Committed by Greg Kroah-Hartman
Browse files

docs: kdoc: handle the obsolescensce of docutils.ErrorString()



commit 00d95fcc upstream.

The ErrorString() and SafeString() docutils functions were helpers meant to
ease the handling of encodings during the Python 3 transition.  There is no
real need for them after Python 3.6, and docutils 0.22 removes them,
breaking the docs build

Handle this by just injecting our own one-liner version of ErrorString(),
and removing the sole SafeString() call entirely.

Reported-by: default avatarZhixu Liu <zhixu.liu@gmail.com>
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
Message-ID: <87ldmnv2pi.fsf@trenco.lwn.net>
[ Salvatore Bonaccorso: Backport to v6.17.y for context changes in
  Documentation/sphinx/kernel_include.py with major refactorings for the v6.18
  development cycle. Backport ErrorString definition as well to
  Documentation/sphinx/kernel_abi.py file for 6.12.y where it is imported
  from docutils before the faccc0ec ("docs: sphinx/kernel_abi: adjust
  coding style") change. ]
Suggested-by: default avatarAndreas Radke <andreas.radke@mailbox.org>
Signed-off-by: default avatarSalvatore Bonaccorso <carnil@debian.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc89ac0c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment