From 91379059f4f0d5e2ec8e614448308fa60f0c4b4b Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 13 May 2020 14:54:46 -0400
Subject: [PATCH] utf8 python for sip, not enough, but it's a start

---
 mob.ini           |  6 +++---
 src/tasks/sip.cpp | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/mob.ini b/mob.ini
index 29966c8..2bbc0ef 100644
--- a/mob.ini
+++ b/mob.ini
@@ -20,10 +20,10 @@ vcvars  =
 
 [prebuilt]
 boost   = true
-lz4     = true
+lz4     = false
 openssl = true
-pyqt    = true
-python  = true
+pyqt    = false
+python  = false
 usvfs   = false
 
 [versions]
diff --git a/src/tasks/sip.cpp b/src/tasks/sip.cpp
index c1e7f6c..a578398 100644
--- a/src/tasks/sip.cpp
+++ b/src/tasks/sip.cpp
@@ -100,12 +100,18 @@ void sip::download()
 
 	run_tool(process_runner(process()
 		.binary(python::python_exe())
+		.chcp(65001)
+		.stdout_encoding(encodings::utf8)
+		.stderr_encoding(encodings::utf8)
+		.arg("-X", "utf8")
 		.arg("-m", "pip")
 		.arg("download")
 		.arg("--no-binary=:all:")
 		.arg("--no-deps")
 		.arg("-d", paths::cache())
-		.arg("sip==" + version())));
+		.arg("sip==" + version())
+		.env(this_env::get()
+			.set("PYTHONUTF8", "1"))));
 }
 
 void sip::generate()
@@ -127,6 +133,9 @@ void sip::generate()
 
 	run_tool(process_runner(process()
 		.binary(python::python_exe())
+		.chcp(65001)
+		.stdout_encoding(encodings::utf8)
+		.stderr_encoding(encodings::utf8)
 		.stderr_filter([&](process::filter& f)
 		{
 			if (f.line.find("zip_safe flag not set") != std::string::npos)
@@ -134,9 +143,12 @@ void sip::generate()
 			else if (f.line.find("module references __file__") != std::string::npos)
 				f.lv = context::level::trace;
 		})
+		.arg("-X", "utf8")
 		.arg("setup.py")
 		.arg("install")
-		.cwd(source_path())));
+		.cwd(source_path())
+		.env(this_env::get()
+			.set("PYTHONUTF8", "1"))));
 
 	run_tool(process_runner(process()
 		.binary(sip_module_exe())