iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs/sphinx: Explicitly convert Sphinx paths to str

Browse Source 
Sphinx 7.2+ is switching to using pathlib.Path
instead of str to represent paths. This fixes the
current deprecation warnings and eventual breakage.
This conversion will be a no-op when using older
Sphinx versions.

Signed-off-by: Oliver Faso <erer1243@gmail.com>
Tested-by: Akira Yokosawa <akiyks@gmail.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/20230910040811.53046-1-erer1243@gmail.com
This commit is contained in:
Oliver Faso
2023-09-10 00:08:06 -04:00
committed by Jonathan Corbet
parent 3240c37567
commit f00c19c67a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/sphinx/kerneldoc.py
View File

@ -138,7 +138,7 @@ class KernelDocDirective(Directive):
lineoffset = int(match.group(1)) - 1 lineoffset = int(match.group(1)) - 1
# we must eat our comments since the upset the markup # we must eat our comments since the upset the markup
else: else:
doc = env.srcdir + "/" + env.docname + ":" + str(self.lineno) doc = str(env.srcdir) + "/" + env.docname + ":" + str(self.lineno)
result.append(line, doc + ": " + filename, lineoffset) result.append(line, doc + ": " + filename, lineoffset)
lineoffset += 1 lineoffset += 1

2
Documentation/sphinx/kfigure.py
View File

@ -309,7 +309,7 @@ def convert_image(img_node, translator, src_fname=None):
if dst_fname: if dst_fname:
# the builder needs not to copy one more time, so pop it if exists. # the builder needs not to copy one more time, so pop it if exists.
translator.builder.images.pop(img_node['uri'], None) translator.builder.images.pop(img_node['uri'], None)
_name = dst_fname[len(translator.builder.outdir) + 1:] _name = dst_fname[len(str(translator.builder.outdir)) + 1:]
if isNewer(dst_fname, src_fname): if isNewer(dst_fname, src_fname):
kernellog.verbose(app, kernellog.verbose(app,