Revision: 19526
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19526
Author: kjym3
Date: 2009-04-03 22:03:09 +0200 (Fri, 03 Apr 2009)
Log Message:
-----------
Relaxed type checking concerning boolean arguments in class constructors
and __call__ methods so that not only True and False but also various
other boolean expressions (e.g., 0, 1, and None) are accepted.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
2009-04-03 19:19:02 UTC (rev 19525)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
2009-04-03 20:03:09 UTC (rev 19526)
@@ -326,7 +326,7 @@
//==============================
bool bool_from_PyBool( PyObject *b ) {
- return (b == Py_True || PyInt_AsLong(b) != 0);
+ return PyObject_IsTrue(b) != 0;
}
IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj ) {
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
2009-04-03 19:19:02 UTC (rev 19525)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
2009-04-03 20:03:09 UTC (rev 19526)
@@ -390,7 +390,7 @@
PyObject * StrokeAttribute_setVisible( BPy_StrokeAttribute *self, PyObject
*args ) {
PyObject *py_b;
- if(!( PyArg_ParseTuple(args, "O!", &PyBool_Type, &py_b) ))
+ if(!( PyArg_ParseTuple(args, "O", &py_b) ))
return NULL;
self->sa->setVisible( bool_from_PyBool(py_b) );
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
2009-04-03 19:19:02 UTC (rev 19525)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
2009-04-03 20:03:09 UTC (rev 19526)
@@ -330,7 +330,7 @@
PyObject *FEdge_setSmooth( BPy_FEdge *self , PyObject *args) {
PyObject *py_b;
- if(!( PyArg_ParseTuple(args, "O!", &PyBool_Type, &py_b) ))
+ if(!( PyArg_ParseTuple(args, "O", &py_b) ))
return NULL;
self->fe->setSmooth( bool_from_PyBool(py_b) );
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
2009-04-03 19:19:02 UTC (rev 19525)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
2009-04-03 20:03:09 UTC (rev 19526)
@@ -354,7 +354,7 @@
PyObject *Stroke_setTips( BPy_Stroke *self , PyObject *args) {
PyObject *py_b;
- if(!( PyArg_ParseTuple(args, "O!", &PyBool_Type, &py_b) ))
+ if(!( PyArg_ParseTuple(args, "O", &py_b) ))
return NULL;
self->s->setTips( bool_from_PyBool(py_b) );
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
2009-04-03 19:19:02 UTC (rev 19525)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
2009-04-03 20:03:09 UTC (rev 19526)
@@ -145,7 +145,7 @@
PyObject * Chain_push_viewedge_back( BPy_Chain *self, PyObject *args ) {
PyObject *obj1 = 0, *obj2 = 0;
- if(!( PyArg_ParseTuple(args, "O!O!", &ViewEdge_Type, &obj1,
&PyBool_Type, &obj2) ))
+ if(!( PyArg_ParseTuple(args, "O!O", &ViewEdge_Type, &obj1, &obj2) ))
return NULL;
ViewEdge *ve = ((BPy_ViewEdge *) obj1)->ve;
@@ -158,7 +158,7 @@
PyObject * Chain_push_viewedge_front( BPy_Chain *self, PyObject *args ) {
PyObject *obj1 = 0, *obj2 = 0;
- if(!( PyArg_ParseTuple(args, "O!O!", &ViewEdge_Type, &obj1,
&PyBool_Type, &obj2) ))
+ if(!( PyArg_ParseTuple(args, "O!O", &ViewEdge_Type, &obj1, &obj2) ))
return NULL;
ViewEdge *ve = ((BPy_ViewEdge *) obj1)->ve;
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
2009-04-03 19:19:02 UTC (rev 19525)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
2009-04-03 20:03:09 UTC (rev 19526)
@@ -124,8 +124,8 @@
self->a_it = new AdjacencyIterator(*( ((BPy_AdjacencyIterator
*) obj1)->a_it ));
} else if( BPy_ViewVertex_Check(obj1) ) {
- bool restrictToSelection = ( obj2 && PyBool_Check(obj2) ) ?
bool_from_PyBool(obj2) : true;
- bool restrictToUnvisited = ( obj3 && PyBool_Check(obj3) ) ?
bool_from_PyBool(obj3) : true;
+ bool restrictToSelection = ( obj2 ) ? bool_from_PyBool(obj2) :
true;
+ bool restrictToUnvisited = ( obj3 ) ? bool_from_PyBool(obj3) :
true;
self->a_it = new AdjacencyIterator( ((BPy_ViewVertex *)
obj1)->vv, restrictToSelection, restrictToUnvisited );
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
2009-04-03 19:19:02 UTC (rev 19525)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
2009-04-03 20:03:09 UTC (rev 19526)
@@ -111,29 +111,53 @@
{
PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0, *obj4 = 0, *obj5 = 0, *obj6 =
0;
- if (!( PyArg_ParseTuple(args, "O|OOOOO", &obj1, &obj2, &obj3, &obj4,
&obj5, &obj6) ))
+ if (!( PyArg_ParseTuple(args, "|OOOOOO", &obj1, &obj2, &obj3, &obj4,
&obj5, &obj6) ))
return -1;
if( obj1 && BPy_ChainPredicateIterator_Check(obj1) ) {
self->cp_it = new ChainPredicateIterator(*(
((BPy_ChainPredicateIterator *) obj1)->cp_it ));
- } else if( obj1 && BPy_UnaryPredicate1D_Check(obj1) &&
((BPy_UnaryPredicate1D *) obj1)->up1D &&
- obj2 && BPy_BinaryPredicate1D_Check(obj2) &&
((BPy_BinaryPredicate1D *) obj2)->bp1D ) {
+ } else if( obj1 && BPy_UnaryPredicate1D_Check(obj1) &&
+ obj2 && BPy_BinaryPredicate1D_Check(obj2) ) {
+ if (!((BPy_UnaryPredicate1D *) obj1)->up1D) {
+ PyErr_SetString(PyExc_TypeError, "1st argument: invalid
UnaryPredicate1D object");
+ return -1;
+ }
+ if (!((BPy_BinaryPredicate1D *) obj2)->bp1D) {
+ PyErr_SetString(PyExc_TypeError, "2nd argument: invalid
BinaryPredicate1D object");
+ return -1;
+ }
UnaryPredicate1D *up1D = ((BPy_UnaryPredicate1D *) obj1)->up1D;
BinaryPredicate1D *bp1D = ((BPy_BinaryPredicate1D *)
obj2)->bp1D;
- bool restrictToSelection = ( obj3 && PyBool_Check(obj3) ) ?
bool_from_PyBool(obj3) : true;
- bool restrictToUnvisited = ( obj4 && PyBool_Check(obj4) ) ?
bool_from_PyBool(obj4) : true;
- ViewEdge *begin = ( obj5 && BPy_ViewEdge_Check(obj5) ) ?
((BPy_ViewEdge *) obj5)->ve : 0;
- bool orientation = ( obj6 && PyBool_Check(obj6) ) ?
bool_from_PyBool(obj6) : true;
+ bool restrictToSelection = ( obj3 ) ? bool_from_PyBool(obj3) :
true;
+ bool restrictToUnvisited = ( obj4 ) ? bool_from_PyBool(obj4) :
true;
+ ViewEdge *begin;
+ if ( !obj5 || obj5 == Py_None )
+ begin = NULL;
+ else if ( BPy_ViewEdge_Check(obj5) )
+ begin = ((BPy_ViewEdge *) obj5)->ve;
+ else {
+ PyErr_SetString(PyExc_TypeError, "5th argument must be
either a ViewEdge object or None");
+ return -1;
+ }
+ bool orientation = ( obj6 ) ? bool_from_PyBool(obj6) : true;
self->cp_it = new ChainPredicateIterator( *up1D, *bp1D,
restrictToSelection, restrictToUnvisited, begin, orientation);
} else {
- bool restrictToSelection = ( obj1 && PyBool_Check(obj1) ) ?
bool_from_PyBool(obj1) : true;
- bool restrictToUnvisited = ( obj2 && PyBool_Check(obj2) ) ?
bool_from_PyBool(obj2) : true;
- ViewEdge *begin = ( obj3 && BPy_ViewEdge_Check(obj3) ) ?
((BPy_ViewEdge *) obj3)->ve : 0;
- bool orientation = ( obj4 && PyBool_Check(obj4) ) ?
bool_from_PyBool(obj4) : true;
+ bool restrictToSelection = ( obj1 ) ? bool_from_PyBool(obj1) :
true;
+ bool restrictToUnvisited = ( obj2 ) ? bool_from_PyBool(obj2) :
true;
+ ViewEdge *begin;
+ if ( !obj3 || obj3 == Py_None )
+ begin = NULL;
+ else if ( BPy_ViewEdge_Check(obj3) )
+ begin = ((BPy_ViewEdge *) obj3)->ve;
+ else {
+ PyErr_SetString(PyExc_TypeError, "3rd argument must be
either a ViewEdge object or None");
+ return -1;
+ }
+ bool orientation = ( obj4 ) ? bool_from_PyBool(obj4) : true;
self->cp_it = new ChainPredicateIterator( restrictToSelection,
restrictToUnvisited, begin, orientation);
}
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
2009-04-03 19:19:02 UTC (rev 19525)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
2009-04-03 20:03:09 UTC (rev 19526)
@@ -118,9 +118,17 @@
self->cs_it = new ChainSilhouetteIterator(*(
((BPy_ChainSilhouetteIterator *) obj1)->cs_it ));
} else {
- bool restrictToSelection = ( obj1 && PyBool_Check(obj1) ) ?
bool_from_PyBool(obj1) : true;
- ViewEdge *begin = ( obj2 && BPy_ViewEdge_Check(obj2) ) ?
((BPy_ViewEdge *) obj2)->ve : 0;
- bool orientation = ( obj3 && PyBool_Check(obj3) ) ?
bool_from_PyBool(obj3) : true;
+ bool restrictToSelection = ( obj1 ) ? bool_from_PyBool(obj1) :
true;
+ ViewEdge *begin;
+ if ( !obj2 || obj2 == Py_None )
+ begin = NULL;
+ else if ( BPy_ViewEdge_Check(obj2) )
+ begin = ((BPy_ViewEdge *) obj2)->ve;
+ else {
+ PyErr_SetString(PyExc_TypeError, "2nd argument must be
either a ViewEdge object or None");
+ return -1;
+ }
+ bool orientation = ( obj3 ) ? bool_from_PyBool(obj3) : true;
self->cs_it = new ChainSilhouetteIterator( restrictToSelection,
begin, orientation);
}
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
