Merge branch 'py2-cp65001' into 'master'

Improve cp65001 compat in cpython < 3.3 See merge request ita1024/waf!2346
2022-09-01 21:39:45 +00:00 · 2022-09-01 21:39:45 +00:00 · 177bd3b0b1
parent c9929238ee e236ef830d
commit 177bd3b0b1
1 changed files with 2 additions and 0 deletions
--- a/waflib/Utils.py
+++ b/waflib/Utils.py
@ -452,6 +452,8 @@ def console_encoding():
 			pass
 		else:
 			if codepage:
+				if 65001 == codepage and sys.version_info < (3, 3):
+					return 'utf-8'
 				return 'cp%d' % codepage
 	return sys.stdout.encoding or ('cp1252' if is_win32 else 'latin-1')