Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-05-01 18:22:30 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-05-01 18:25:39 +0400
commitbb5b608deb31a30ed89d99ed4ecca8bab0216318 (patch)
tree8f9e962d72a63ba9aa7270ed1b5ab647a1cf1ee2
parent1e9c4639c2b7c0354bf627ea9ee4f62d3d5ffd73 (diff)
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).
-rw-r--r--source/blender/python/intern/bpy_interface.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 43ca6957f83..6dab586e796 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