rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix stripping of lines in asciidoc2html

Browse Source 
This broke in #3382 since re.fullmatch does a different thing for trailing
newlines:

    >>> line
    '===========\n'
    >>> re.match(r'^=+$', line)
    <_sre.SRE_Match object; span=(0, 11), match='==========='>
    >>> re.fullmatch(r'=+', line)
    >>>

This now strips the line by default, and adds newlines if needed.
This commit is contained in:
Florian Bruhin 2017-12-20 11:35:27 +01:00
parent 3c0d51c253
commit 5c00eea122
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/asciidoc2html.py
View File

@ -147,13 +147,14 @@ class AsciiDoc:
last_line = "" last_line = ""
for line in infp: for line in infp:
if line.strip() == '// QUTE_WEB_HIDE': line = line.rstrip()
if line == '// QUTE_WEB_HIDE':
assert not hidden assert not hidden
hidden = True hidden = True
elif line.strip() == '// QUTE_WEB_HIDE_END': elif line == '// QUTE_WEB_HIDE_END':
assert hidden assert hidden
hidden = False hidden = False
elif line == "The Compiler <mail@qutebrowser.org>\n": elif line == "The Compiler <mail@qutebrowser.org>":
continue continue
elif re.fullmatch(r':\w+:.*', line): elif re.fullmatch(r':\w+:.*', line):
# asciidoc field # asciidoc field
@ -163,16 +164,16 @@ class AsciiDoc:
if re.fullmatch(r'=+', line): if re.fullmatch(r'=+', line):
line = line.replace('=', '-') line = line.replace('=', '-')
found_title = True found_title = True
title = last_line.rstrip('\n') + " | qutebrowser\n" title = last_line + " | qutebrowser\n"
title += "=" * (len(title) - 1) title += "=" * (len(title) - 1)
elif re.fullmatch(r'= .+', line): elif re.fullmatch(r'= .+', line):
line = '==' + line[1:] line = '==' + line[1:]
found_title = True found_title = True
title = last_line.rstrip('\n') + " | qutebrowser\n" title = last_line + " | qutebrowser\n"
title += "=" * (len(title) - 1) title += "=" * (len(title) - 1)
if not hidden: if not hidden:
outfp.write(line.replace(".asciidoc[", ".html[")) outfp.write(line.replace(".asciidoc[", ".html[") + '\n')
last_line = line last_line = line
current_lines = outfp.getvalue() current_lines = outfp.getvalue()