[Bf-blender-cvs] [35ca209] master: Code cleanup: remove unused kludge for Py/Win encoding

Campbell Barton noreply at git.blender.org
Thu May 1 16:57:20 CEST 2014


Commit: 35ca2091529cc7817f52ecc36b09f27713f474c1
Author: Campbell Barton
Date:   Fri May 2 00:56:24 2014 +1000
https://developer.blender.org/rB35ca2091529cc7817f52ecc36b09f27713f474c1

Code cleanup: remove unused kludge for Py/Win encoding

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

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 6dab586..045acc6 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -273,24 +273,6 @@ void BPY_python_start(int argc, const char **argv)
 
 	Py_Initialize();
 
-	/* THIS IS BAD: see http://bugs.python.org/issue16129 */
-	/* this clobbers the stdout on exit (no 'MEM_printmemlist_stats') */
-#if 0
-	/* until python provides a reliable way to set the env var */
-	PyRun_SimpleString("import sys, io\n"
-	                   "sys.__backup_stdio__ = sys.__stdout__, sys.__stderr__\n"  /* else we loose the FD's [#32720] */
-	                   "sys.__stdout__ = sys.stdout = io.TextIOWrapper(io.open(sys.stdout.fileno(), 'wb', -1), "
-	                   "encoding='utf-8', errors='surrogateescape', newline='\\n', line_buffering=True)\n"
-	                   "sys.__stderr__ = sys.stderr = io.TextIOWrapper(io.open(sys.stderr.fileno(), 'wb', -1), "
-	                   "encoding='utf-8', errors='surrogateescape', newline='\\n', line_buffering=True)\n");
-	if (PyErr_Occurred()) {
-		PyErr_Print();
-		PyErr_Clear();
-	}
-#endif
-	/* end the baddness */
-
-
 	// PySys_SetArgv(argc, argv);  /* broken in py3, not a huge deal */
 	/* sigh, why do python guys not have a (char **) version anymore? */
 	{




More information about the Bf-blender-cvs mailing list