Commit f00c19c6 authored by Oliver Faso's avatar Oliver Faso Committed by Jonathan Corbet
Browse files

docs/sphinx: Explicitly convert Sphinx paths to str 



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: default avatarOliver Faso <erer1243@gmail.com>
Tested-by: default avatarAkira Yokosawa <akiyks@gmail.com>
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/20230910040811.53046-1-erer1243@gmail.com
parent 3240c375

Documentation/sphinx/kerneldoc.py

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ class KernelDocDirective(Directive): 
                    lineoffset = int(match.group(1)) - 1

                    # we must eat our comments since the upset the markup

                else:

                    doc = env.srcdir + "/" + env.docname + ":" + str(self.lineno)

                    doc = str(env.srcdir) + "/" + env.docname + ":" + str(self.lineno)

                    result.append(line, doc + ": " + filename, lineoffset)

                    lineoffset += 1

Documentation/sphinx/kfigure.py

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ def convert_image(img_node, translator, src_fname=None): 
    if dst_fname:

        # the builder needs not to copy one more time, so pop it if exists.

        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):

            kernellog.verbose(app,