mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
Docs: drop Python 2 support
The kernel build system as a whole is dropping support for Python 2, so we should do the same. The effects are rather small, especially considering that much of the deleted code was not doing anything under any version of Python anyway. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
@@ -49,26 +49,14 @@ import os
|
|||||||
from os import path
|
from os import path
|
||||||
import subprocess
|
import subprocess
|
||||||
from hashlib import sha1
|
from hashlib import sha1
|
||||||
import sys
|
|
||||||
|
|
||||||
from docutils import nodes
|
from docutils import nodes
|
||||||
from docutils.statemachine import ViewList
|
from docutils.statemachine import ViewList
|
||||||
from docutils.parsers.rst import directives
|
from docutils.parsers.rst import directives
|
||||||
from docutils.parsers.rst.directives import images
|
from docutils.parsers.rst.directives import images
|
||||||
import sphinx
|
import sphinx
|
||||||
|
|
||||||
from sphinx.util.nodes import clean_astext
|
from sphinx.util.nodes import clean_astext
|
||||||
from six import iteritems
|
|
||||||
|
|
||||||
import kernellog
|
import kernellog
|
||||||
|
|
||||||
PY3 = sys.version_info[0] == 3
|
|
||||||
|
|
||||||
if PY3:
|
|
||||||
_unicode = str
|
|
||||||
else:
|
|
||||||
_unicode = unicode
|
|
||||||
|
|
||||||
# Get Sphinx version
|
# Get Sphinx version
|
||||||
major, minor, patch = sphinx.version_info[:3]
|
major, minor, patch = sphinx.version_info[:3]
|
||||||
if major == 1 and minor > 3:
|
if major == 1 and minor > 3:
|
||||||
@@ -540,7 +528,7 @@ def add_kernel_figure_to_std_domain(app, doctree):
|
|||||||
docname = app.env.docname
|
docname = app.env.docname
|
||||||
labels = std.data["labels"]
|
labels = std.data["labels"]
|
||||||
|
|
||||||
for name, explicit in iteritems(doctree.nametypes):
|
for name, explicit in doctree.nametypes.items():
|
||||||
if not explicit:
|
if not explicit:
|
||||||
continue
|
continue
|
||||||
labelid = doctree.nameids[name]
|
labelid = doctree.nameids[name]
|
||||||
|
@@ -61,8 +61,6 @@ class MaintainersInclude(Include):
|
|||||||
field_content = ""
|
field_content = ""
|
||||||
|
|
||||||
for line in open(path):
|
for line in open(path):
|
||||||
if sys.version_info.major == 2:
|
|
||||||
line = unicode(line, 'utf-8')
|
|
||||||
# Have we reached the end of the preformatted Descriptions text?
|
# Have we reached the end of the preformatted Descriptions text?
|
||||||
if descriptions and line.startswith('Maintainers'):
|
if descriptions and line.startswith('Maintainers'):
|
||||||
descriptions = False
|
descriptions = False
|
||||||
|
@@ -1,4 +1,3 @@
|
|||||||
docutils
|
docutils
|
||||||
Sphinx==2.4.4
|
Sphinx==2.4.4
|
||||||
sphinx_rtd_theme
|
sphinx_rtd_theme
|
||||||
six
|
|
||||||
|
@@ -42,8 +42,6 @@ u"""
|
|||||||
# imports
|
# imports
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
import sys
|
|
||||||
|
|
||||||
from docutils import nodes
|
from docutils import nodes
|
||||||
from docutils.parsers.rst import directives, roles
|
from docutils.parsers.rst import directives, roles
|
||||||
from docutils.parsers.rst.directives.tables import Table
|
from docutils.parsers.rst.directives.tables import Table
|
||||||
@@ -55,14 +53,6 @@ from docutils.utils import SystemMessagePropagation
|
|||||||
|
|
||||||
__version__ = '1.0'
|
__version__ = '1.0'
|
||||||
|
|
||||||
PY3 = sys.version_info[0] == 3
|
|
||||||
PY2 = sys.version_info[0] == 2
|
|
||||||
|
|
||||||
if PY3:
|
|
||||||
# pylint: disable=C0103, W0622
|
|
||||||
unicode = str
|
|
||||||
basestring = str
|
|
||||||
|
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
def setup(app):
|
def setup(app):
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
@@ -728,8 +728,8 @@ sub check_needs()
|
|||||||
$need_virtualenv = 1;
|
$need_virtualenv = 1;
|
||||||
}
|
}
|
||||||
if ($1 < 3) {
|
if ($1 < 3) {
|
||||||
# Complain if it finds python2 (or worse)
|
# Fail if it finds python2 (or worse)
|
||||||
printf "Warning: python$1 support is deprecated. Use it with caution!\n";
|
die "Python 3 is required to build the kernel docs\n";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
die "Warning: couldn't identify $python_cmd version!";
|
die "Warning: couldn't identify $python_cmd version!";
|
||||||
|
Reference in New Issue
Block a user