mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
Documentation/sphinx: fix Python string escapes
Python 3.6 introduced a DeprecationWarning for invalid escape sequences. This is upgraded to a SyntaxWarning in Python 3.12, and will eventually be a syntax error. Fix these now to get ahead of it before it's an error. Signed-off-by: Benjamin Gray <bgray@linux.ibm.com> Message-ID: <20230912060801.95533-3-bgray@linux.ibm.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
parent
0bb80ecc33
commit
86a0adc029
@ -93,7 +93,7 @@ def markup_ctype_refs(match):
|
|||||||
#
|
#
|
||||||
RE_expr = re.compile(r':c:(expr|texpr):`([^\`]+)`')
|
RE_expr = re.compile(r':c:(expr|texpr):`([^\`]+)`')
|
||||||
def markup_c_expr(match):
|
def markup_c_expr(match):
|
||||||
return '\ ``' + match.group(2) + '``\ '
|
return '\\ ``' + match.group(2) + '``\\ '
|
||||||
|
|
||||||
#
|
#
|
||||||
# Parse Sphinx 3.x C markups, replacing them by backward-compatible ones
|
# Parse Sphinx 3.x C markups, replacing them by backward-compatible ones
|
||||||
|
@ -138,7 +138,7 @@ class KernelCmd(Directive):
|
|||||||
code_block += "\n " + l
|
code_block += "\n " + l
|
||||||
lines = code_block + "\n\n"
|
lines = code_block + "\n\n"
|
||||||
|
|
||||||
line_regex = re.compile("^\.\. LINENO (\S+)\#([0-9]+)$")
|
line_regex = re.compile(r"^\.\. LINENO (\S+)\#([0-9]+)$")
|
||||||
ln = 0
|
ln = 0
|
||||||
n = 0
|
n = 0
|
||||||
f = fname
|
f = fname
|
||||||
|
@ -104,7 +104,7 @@ class KernelFeat(Directive):
|
|||||||
|
|
||||||
lines = self.runCmd(cmd, shell=True, cwd=cwd, env=shell_env)
|
lines = self.runCmd(cmd, shell=True, cwd=cwd, env=shell_env)
|
||||||
|
|
||||||
line_regex = re.compile("^\.\. FILE (\S+)$")
|
line_regex = re.compile(r"^\.\. FILE (\S+)$")
|
||||||
|
|
||||||
out_lines = ""
|
out_lines = ""
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ class KernelDocDirective(Directive):
|
|||||||
result = ViewList()
|
result = ViewList()
|
||||||
|
|
||||||
lineoffset = 0;
|
lineoffset = 0;
|
||||||
line_regex = re.compile("^\.\. LINENO ([0-9]+)$")
|
line_regex = re.compile(r"^\.\. LINENO ([0-9]+)$")
|
||||||
for line in lines:
|
for line in lines:
|
||||||
match = line_regex.search(line)
|
match = line_regex.search(line)
|
||||||
if match:
|
if match:
|
||||||
|
@ -77,7 +77,7 @@ class MaintainersInclude(Include):
|
|||||||
line = line.rstrip()
|
line = line.rstrip()
|
||||||
|
|
||||||
# Linkify all non-wildcard refs to ReST files in Documentation/.
|
# Linkify all non-wildcard refs to ReST files in Documentation/.
|
||||||
pat = '(Documentation/([^\s\?\*]*)\.rst)'
|
pat = r'(Documentation/([^\s\?\*]*)\.rst)'
|
||||||
m = re.search(pat, line)
|
m = re.search(pat, line)
|
||||||
if m:
|
if m:
|
||||||
# maintainers.rst is in a subdirectory, so include "../".
|
# maintainers.rst is in a subdirectory, so include "../".
|
||||||
@ -90,11 +90,11 @@ class MaintainersInclude(Include):
|
|||||||
output = "| %s" % (line.replace("\\", "\\\\"))
|
output = "| %s" % (line.replace("\\", "\\\\"))
|
||||||
# Look for and record field letter to field name mappings:
|
# Look for and record field letter to field name mappings:
|
||||||
# R: Designated *reviewer*: FullName <address@domain>
|
# R: Designated *reviewer*: FullName <address@domain>
|
||||||
m = re.search("\s(\S):\s", line)
|
m = re.search(r"\s(\S):\s", line)
|
||||||
if m:
|
if m:
|
||||||
field_letter = m.group(1)
|
field_letter = m.group(1)
|
||||||
if field_letter and not field_letter in fields:
|
if field_letter and not field_letter in fields:
|
||||||
m = re.search("\*([^\*]+)\*", line)
|
m = re.search(r"\*([^\*]+)\*", line)
|
||||||
if m:
|
if m:
|
||||||
fields[field_letter] = m.group(1)
|
fields[field_letter] = m.group(1)
|
||||||
elif subsystems:
|
elif subsystems:
|
||||||
@ -112,7 +112,7 @@ class MaintainersInclude(Include):
|
|||||||
field_content = ""
|
field_content = ""
|
||||||
|
|
||||||
# Collapse whitespace in subsystem name.
|
# Collapse whitespace in subsystem name.
|
||||||
heading = re.sub("\s+", " ", line)
|
heading = re.sub(r"\s+", " ", line)
|
||||||
output = output + "%s\n%s" % (heading, "~" * len(heading))
|
output = output + "%s\n%s" % (heading, "~" * len(heading))
|
||||||
field_prev = ""
|
field_prev = ""
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user