diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2025-11-18 19:26:11 +0300 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2025-11-18 19:26:11 +0300 |
| commit | 34a28245b6a5c4227b7122c0ff9b98d22b39f033 (patch) | |
| tree | 5f1e928a65d14b06b264b4c381b032acc1a6dbd3 /Documentation/sphinx/kerneldoc.py | |
| parent | f690e07859e67505e7106ef5b4fae5e8b71b2109 (diff) | |
| parent | 992a9df41ad7173588bf90e15b33d45db2811aea (diff) | |
| download | linux-34a28245b6a5c4227b7122c0ff9b98d22b39f033.tar.xz | |
Merge branch 'python-modules' into docs-mw
scripts/lib was always a bit of an awkward place for Python libraries; give
them a proper home under tools/lib/python. Put the modules from
tools/docs/lib there for good measure.
The second patch ties them into a single package namespace. It would be
more aesthetically pleasing to add a kernel layer, so we could say:
from kernel.kdoc import kdoc_parser
...and have the kernel-specific stuff clearly marked, but that means adding
an empty directory in the hierarchy, which isn't as pleasing.
There are some other "Python library" directories hidden in the kernel
tree; we may eventually want to encourage them to move as well.
Diffstat (limited to 'Documentation/sphinx/kerneldoc.py')
| -rw-r--r-- | Documentation/sphinx/kerneldoc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/sphinx/kerneldoc.py b/Documentation/sphinx/kerneldoc.py index 2586b4d4e494..d8cdf068ef35 100644 --- a/Documentation/sphinx/kerneldoc.py +++ b/Documentation/sphinx/kerneldoc.py @@ -42,10 +42,10 @@ from sphinx.util import logging from pprint import pformat srctree = os.path.abspath(os.environ["srctree"]) -sys.path.insert(0, os.path.join(srctree, "scripts/lib/kdoc")) +sys.path.insert(0, os.path.join(srctree, "tools/lib/python")) -from kdoc_files import KernelFiles -from kdoc_output import RestFormat +from kdoc.kdoc_files import KernelFiles +from kdoc.kdoc_output import RestFormat __version__ = '1.0' kfiles = None |