From mboxrd@z Thu Jan  1 00:00:00 1970
From: john at keeping.me.uk (John Keeping)
Date: Fri, 10 Mar 2017 15:28:46 +0000
Subject: [PATCH] filter: set environment variable PYTHONIOENCODING to utf-8
In-Reply-To: <20170309001810.3059-1-roy@marples.name>
References: <20170309001810.3059-1-roy@marples.name>
Message-ID: <20170310152846.GH2102@john.keeping.me.uk>

On Thu, Mar 09, 2017 at 12:18:10AM +0000, Roy Marples wrote:
> This allows different versions of Python to be used rather than
> forcing version specific encoding in each script.
> 
> Signed-off-by: Roy Marples <roy at marples.name>

Reviewed-by: John Keeping <john at keeping.me.uk>

> ---
>  filter.c                       | 2 ++
>  filters/email-gravatar.py      | 3 ---
>  filters/syntax-highlighting.py | 5 +----
>  3 files changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/filter.c b/filter.c
> index 949c931..84dd0ed 100644
> --- a/filter.c
> +++ b/filter.c
> @@ -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)
> -- 
> 2.11.1
> 
> _______________________________________________
> CGit mailing list
> CGit at lists.zx2c4.com
> https://lists.zx2c4.com/mailman/listinfo/cgit