mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-23 00:48:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter: set environment variable PYTHONIOENCODING to utf-8

Browse Source 
This allows different versions of Python to be used rather than
forcing version specific encoding in each script.

Signed-off-by: Roy Marples <roy@marples.name>
Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
Roy Marples 2017-03-09 00:18:10 +00:00 committed by Lukas Fleischer
parent 7f7f91141c
commit 67e2b69ec9
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filter.c
View File

@ -55,6 +55,8 @@ static int open_exec_filter(struct cgit_filter *base, va_list ap)
close(filter->pipe_fh[1]); close(filter->pipe_fh[1]);
chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
"Unable to use pipe as STDIN"); "Unable to use pipe as STDIN");
/* Always input/output utf-8 for a Python filter. */
setenv("PYTHONIOENCODING", "utf-8", 1);
execvp(filter->cmd, filter->argv); execvp(filter->cmd, filter->argv);
die_errno("Unable to exec subprocess %s", filter->cmd); die_errno("Unable to exec subprocess %s", filter->cmd);
} }

3
filters/email-gravatar.py
View File

@ -30,9 +30,6 @@ if email[-1] == '>':
page = sys.argv[2] page = sys.argv[2]
sys.stdin = codecs.getreader("utf-8")(sys.stdin.detach())
sys.stdout = codecs.getwriter("utf-8")(sys.stdout.detach())
md5 = hashlib.md5(email.encode()).hexdigest() md5 = hashlib.md5(email.encode()).hexdigest()
text = sys.stdin.read().strip() text = sys.stdin.read().strip()

5
filters/syntax-highlighting.py
View File

@ -29,9 +29,6 @@ from pygments.lexers import guess_lexer
from pygments.lexers import guess_lexer_for_filename from pygments.lexers import guess_lexer_for_filename
from pygments.formatters import HtmlFormatter from pygments.formatters import HtmlFormatter
sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='utf-8', errors='replace')
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace')
data = sys.stdin.read() data = sys.stdin.read()
filename = sys.argv[1] filename = sys.argv[1]
formatter = HtmlFormatter(style='pastie') formatter = HtmlFormatter(style='pastie')
@ -52,4 +49,4 @@ except TypeError:
sys.stdout.write('<style>') sys.stdout.write('<style>')
sys.stdout.write(formatter.get_style_defs('.highlight')) sys.stdout.write(formatter.get_style_defs('.highlight'))
sys.stdout.write('</style>') sys.stdout.write('</style>')
sys.stdout.write(highlight(data, lexer, formatter, outfile=None)) highlight(data, lexer, formatter, outfile=sys.stdout)