Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-27 20:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

fish_indent_lexer: explicitly encode/decode bytes over pipe

Browse source 
Universal newlines behaves differently between Python 2.7 and 3.x,
leading to problems when running Sphinx with Python 2.7.

fish_indent always uses \n, so there's no need to use universal newline
detection.

This also allows full UTF-8 in documentation sources.

Closes #5808.
This commit is contained in:
David Adam 2019-04-12 23:07:41 +08:00
parent a8030c020b
commit 2ca1bc433f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sphinx_doc_src/fish_indent_lexer.py
View file

@ -89,11 +89,11 @@ def tokenize_fish_command(code, offset):
["fish_indent", "--pygments"], ["fish_indent", "--pygments"],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
universal_newlines=True, universal_newlines=False,
) )
stdout, _ = proc.communicate(code) stdout, _ = proc.communicate(code.encode('utf-8'))
result = [] result = []
for line in stdout.splitlines(): for line in stdout.decode('utf-8').splitlines():
start, end, role = line.split(",") start, end, role = line.split(",")
start, end = int(start), int(end) start, end = int(start), int(end)
value = code[start:end] value = code[start:end]