[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28933] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/python: Fixed invalid use of PyUnicode_FromFormat () where PyUnicode_FromString()

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun May 23 14:10:31 CEST 2010


Revision: 28933
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28933
Author:   kjym3
Date:     2010-05-23 14:10:31 +0200 (Sun, 23 May 2010)

Log Message:
-----------
Fixed invalid use of PyUnicode_FromFormat() where PyUnicode_FromString()
should have been used.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Iterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -81,7 +81,7 @@
 
 static PyObject * BinaryPredicate0D_getName( BPy_BinaryPredicate0D *self, PyObject *args)
 {
-	return PyUnicode_FromFormat( self->bp0D->getName().c_str() );
+	return PyUnicode_FromString( self->bp0D->getName().c_str() );
 }
 
 static PyObject * BinaryPredicate0D___call__( BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds)

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -110,7 +110,7 @@
 
 static PyObject *BinaryPredicate1D_getName( BPy_BinaryPredicate1D *self, PyObject *args)
 {
-	return PyUnicode_FromFormat( self->bp1D->getName().c_str() );
+	return PyUnicode_FromString( self->bp1D->getName().c_str() );
 }
 
 static PyObject *BinaryPredicate1D___call__( BPy_BinaryPredicate1D *self, PyObject *args, PyObject *kwds)

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface0D.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface0D.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -99,7 +99,7 @@
 "   :rtype: string\n";
 
 static PyObject *Interface0D_getExactTypeName( BPy_Interface0D *self ) {
-	return PyUnicode_FromFormat( self->if0D->getExactTypeName().c_str() );	
+	return PyUnicode_FromString( self->if0D->getExactTypeName().c_str() );	
 }
 
 static char Interface0D_getX___doc__[] =

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface1D.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface1D.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -109,7 +109,7 @@
 "   :rtype: string\n";
 
 static PyObject *Interface1D_getExactTypeName( BPy_Interface1D *self ) {
-	return PyUnicode_FromFormat( self->if1D->getExactTypeName().c_str() );	
+	return PyUnicode_FromString( self->if1D->getExactTypeName().c_str() );	
 }
 
 #if 0

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Iterator.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Iterator.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Iterator.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -110,7 +110,7 @@
 "   :rtype: string\n";
 
 static PyObject * Iterator_getExactTypeName(BPy_Iterator* self) {
-	return PyUnicode_FromFormat( self->it->getExactTypeName().c_str() );	
+	return PyUnicode_FromString( self->it->getExactTypeName().c_str() );	
 }
 
 static char Iterator_increment___doc__[] =

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -125,7 +125,7 @@
 		 << " - R: " << self->sa->getThicknessR() 
 		 << " L: " << self->sa->getThicknessL();
 
-	return PyUnicode_FromFormat( repr.str().c_str() );
+	return PyUnicode_FromString( repr.str().c_str() );
 }
 
 

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -209,7 +209,7 @@
 
 static PyObject * StrokeShader_getName( BPy_StrokeShader *self, PyObject *args)
 {
-	return PyUnicode_FromFormat( self->ss->getName().c_str() );
+	return PyUnicode_FromString( self->ss->getName().c_str() );
 }
 
 static char StrokeShader_shade___doc__[] =

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -73,7 +73,7 @@
 
 static PyObject * UnaryFunction0D___repr__(BPy_UnaryFunction0D* self)
 {
-    return PyUnicode_FromFormat("UnaryFunction0D");
+    return PyUnicode_FromString("UnaryFunction0D");
 }
 
 /*-----------------------BPy_UnaryFunction0D type definition ------------------------------*/

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -64,7 +64,7 @@
 
 static PyObject * UnaryFunction1D___repr__(BPy_UnaryFunction1D* self)
 {
-    return PyUnicode_FromFormat("UnaryFunction1D");
+    return PyUnicode_FromString("UnaryFunction1D");
 }
 
 /*-----------------------BPy_UnaryFunction1D type definition ------------------------------*/

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -90,7 +90,7 @@
 
 static PyObject * UnaryPredicate0D_getName( BPy_UnaryPredicate0D *self )
 {
-	return PyUnicode_FromFormat( self->up0D->getName().c_str() );
+	return PyUnicode_FromString( self->up0D->getName().c_str() );
 }
 
 static PyObject * UnaryPredicate0D___call__( BPy_UnaryPredicate0D *self, PyObject *args, PyObject *kwds)

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -136,7 +136,7 @@
 
 static PyObject * UnaryPredicate1D_getName( BPy_UnaryPredicate1D *self, PyObject *args)
 {
-	return PyUnicode_FromFormat( self->up1D->getName().c_str() );
+	return PyUnicode_FromString( self->up1D->getName().c_str() );
 }
 
 static PyObject * UnaryPredicate1D___call__( BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds)

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -128,7 +128,7 @@
 
 static PyObject * UnaryFunction0DDouble_getName( BPy_UnaryFunction0DDouble *self )
 {
-	return PyUnicode_FromFormat( self->uf0D_double->getName().c_str() );
+	return PyUnicode_FromString( self->uf0D_double->getName().c_str() );
 }
 
 static PyObject * UnaryFunction0DDouble___call__( BPy_UnaryFunction0DDouble *self, PyObject *args, PyObject *kwds)

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -72,7 +72,7 @@
 
 static PyObject * UnaryFunction0DEdgeNature_getName( BPy_UnaryFunction0DEdgeNature *self )
 {
-	return PyUnicode_FromFormat( self->uf0D_edgenature->getName().c_str() );
+	return PyUnicode_FromString( self->uf0D_edgenature->getName().c_str() );
 }
 
 static PyObject * UnaryFunction0DEdgeNature___call__( BPy_UnaryFunction0DEdgeNature *self, PyObject *args, PyObject *kwds)

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp	2010-05-23 10:48:35 UTC (rev 28932)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp	2010-05-23 12:10:31 UTC (rev 28933)
@@ -102,7 +102,7 @@
 

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list