[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40589] trunk/blender/source/blender/ python/generic/py_capi_utils.c: fix for py/rna api bug:

[Campbell Barton]

Revision: 40589
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40589
Author:   campbellbarton
Date:     2011-09-27 04:07:48 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
fix for py/rna api bug:
  PyC_UnicodeAsByte(), used for getting python strings as bytes wasnt clearning utf-8 conversion errors.
  this would raise an error when getting an operators filepath.

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	2011-09-27 03:12:31 UTC (rev 40588)
+++ trunk/blender/source/blender/python/generic/py_capi_utils.c	2011-09-27 04:07:48 UTC (rev 40589)
@@ -363,13 +363,16 @@
 		 * chars since blender doesnt limit this */
 		return result;
 	}
-	else if(PyBytes_Check(py_str)) {
+	else {
 		PyErr_Clear();
-		return PyBytes_AS_STRING(py_str);
+
+		if(PyBytes_Check(py_str)) {
+			return PyBytes_AS_STRING(py_str);
+		}
+		else {
+			return PyBytes_AS_STRING((*coerce= PyUnicode_EncodeFSDefault(py_str)));
+		}
 	}
-	else {
-		return PyBytes_AS_STRING((*coerce= PyUnicode_EncodeFSDefault(py_str)));
-	}
 }
 
 PyObject *PyC_UnicodeFromByte(const char *str)