[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33480] trunk/blender/source/blender/ python/generic/py_capi_utils.c: use PyUnicode_DecodeFSDefault rather then PyUnicode_DecodeUTF8(str, strlen (str), "surrogateescape"), for converting non utf8 names.

Campbell Barton ideasman42 at gmail.com
Sun Dec 5 10:20:18 CET 2010


Revision: 33480
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33480
Author:   campbellbarton
Date:     2010-12-05 10:20:18 +0100 (Sun, 05 Dec 2010)

Log Message:
-----------
use PyUnicode_DecodeFSDefault rather then PyUnicode_DecodeUTF8(str, strlen(str), "surrogateescape"), for converting non utf8 names.
this is needed because some UTF8 names didnt resolve on windows when using surrogateescape'd strings.

This meant you couldn't export to models some directories on windows.

Modified Paths:
--------------
    trunk/blender/source/blender/python/generic/py_capi_utils.c

Modified: trunk/blender/source/blender/python/generic/py_capi_utils.c
===================================================================
--- trunk/blender/source/blender/python/generic/py_capi_utils.c	2010-12-05 08:07:30 UTC (rev 33479)
+++ trunk/blender/source/blender/python/generic/py_capi_utils.c	2010-12-05 09:20:18 UTC (rev 33480)
@@ -265,7 +265,8 @@
 	}
 	else {
 		PyErr_Clear();
-		result= PyUnicode_DecodeUTF8(str, strlen(str), "surrogateescape");
+		/* this means paths will always be accessible once converted, on all OS's */
+		result= PyUnicode_DecodeFSDefault(str);
 		return result;
 	}
 }





More information about the Bf-blender-cvs mailing list