filter: set environment variable PYTHONIOENCODING to utf-8

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

Roy Marples committed 9 years ago

Commit 67e2b691 parent 7f7f9113 files · +3 −7Browse files

Unified · Split

3 files

 		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);
 	}

@@ -30,9 +30,6 @@ if email[-1] == '>': · 29 unmodified lines
30		30
31	page = sys.argv[2]	31	page = sys.argv[2]
32		32
33	sys.stdin = codecs.getreader("utf-8")(sys.stdin.detach())
34	sys.stdout = codecs.getwriter("utf-8")(sys.stdout.detach())
35
36	md5 = hashlib.md5(email.encode()).hexdigest()	33	md5 = hashlib.md5(email.encode()).hexdigest()
37	text = sys.stdin.read().strip()	34	text = sys.stdin.read().strip()
38		35

 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')
 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)