[Bf-blender-cvs] [bb5b608] master: Fix T31555: Username with special chars in Windows 7

Bastien Montagne noreply at git.blender.org
Thu May 1 16:34:33 CEST 2014


Commit: bb5b608deb31a30ed89d99ed4ecca8bab0216318
Author: Bastien Montagne
Date:   Thu May 1 16:22:30 2014 +0200
https://developer.blender.org/rBbb5b608deb31a30ed89d99ed4ecca8bab0216318

Fix T31555: Username with special chars in Windows 7

At last! Could not check seriously on windows (though it was done during py patch
process).

===================================================================

M	source/blender/python/intern/bpy_interface.c

===================================================================

diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 43ca695..6dab586 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -257,11 +257,7 @@ void BPY_python_start(int argc, const char **argv)
 	 * an error, this is highly annoying, another stumbling block for devs,
 	 * so use a more relaxed error handler and enforce utf-8 since the rest of
 	 * blender is utf-8 too - campbell */
-
-	/* XXX, update: this is unreliable! 'PYTHONIOENCODING' is ignored in MS-Windows
-	 * when dynamically linked, see: [#31555] for details.
-	 * Python doesn't expose a good way to set this. */
-	BLI_setenv("PYTHONIOENCODING", "utf-8:surrogateescape");
+	Py_SetStandardStreamEncoding("utf-8", "surrogateescape");
 
 	/* Update, Py3.3 resolves attempting to parse non-existing header */
 #if 0




More information about the Bf-blender-cvs mailing list