diff options
| -rw-r--r-- | filter.c | 2 | ||||
| -rwxr-xr-x | filters/email-gravatar.py | 3 | ||||
| -rwxr-xr-x | filters/syntax-highlighting.py | 5 |
3 files changed, 3 insertions, 7 deletions
@@ -55,6 +55,8 @@ static int open_exec_filter(struct cgit_filter *base, va_list ap) close(filter->pipe_fh[1]); chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), "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); die_errno("Unable to exec subprocess %s", filter->cmd); } diff --git a/filters/email-gravatar.py b/filters/email-gravatar.py index d70440e..8b98471 100755 --- a/filters/email-gravatar.py +++ b/filters/email-gravatar.py @@ -30,9 +30,6 @@ if email[-1] == '>': 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() text = sys.stdin.read().strip() diff --git a/filters/syntax-highlighting.py b/filters/syntax-highlighting.py index 5888b50..936fdb7 100755 --- a/filters/syntax-highlighting.py +++ b/filters/syntax-highlighting.py @@ -29,9 +29,6 @@ from pygments.lexers import guess_lexer from pygments.lexers import guess_lexer_for_filename 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() filename = sys.argv[1] formatter = HtmlFormatter(style='pastie') @@ -52,4 +49,4 @@ except TypeError: sys.stdout.write('<style>') sys.stdout.write(formatter.get_style_defs('.highlight')) sys.stdout.write('</style>') -sys.stdout.write(highlight(data, lexer, formatter, outfile=None)) +highlight(data, lexer, formatter, outfile=sys.stdout) |