[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34195] trunk/blender: use PySequence_Size () rather then PySequence_Length(), this is only kept in python for backwards compatibility.

Campbell Barton ideasman42 at gmail.com
Sun Jan 9 15:53:19 CET 2011


Revision: 34195
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34195
Author:   campbellbarton
Date:     2011-01-09 14:53:18 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
use PySequence_Size() rather then PySequence_Length(), this is only kept in python for backwards compatibility.

Modified Paths:
--------------
    trunk/blender/intern/audaspace/Python/AUD_PyAPI.cpp
    trunk/blender/source/blender/python/generic/IDProp.c
    trunk/blender/source/blender/python/generic/bgl.c
    trunk/blender/source/blender/python/generic/mathutils_vector.c
    trunk/blender/source/blender/python/intern/bpy_props.c
    trunk/blender/source/blender/python/intern/bpy_rna.c
    trunk/blender/source/blender/python/intern/bpy_rna_array.c
    trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.cpp
    trunk/blender/source/gameengine/VideoTexture/FilterColor.cpp
    trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
    trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
    trunk/blender/source/gameengine/VideoTexture/VideoBase.cpp

Modified: trunk/blender/intern/audaspace/Python/AUD_PyAPI.cpp
===================================================================
--- trunk/blender/intern/audaspace/Python/AUD_PyAPI.cpp	2011-01-09 14:30:16 UTC (rev 34194)
+++ trunk/blender/intern/audaspace/Python/AUD_PyAPI.cpp	2011-01-09 14:53:18 UTC (rev 34195)
@@ -851,7 +851,7 @@
 		return NULL;
 	}
 
-	if(!PySequence_Length(py_b) || (py_a != NULL && !PySequence_Length(py_a)))
+	if(!PySequence_Size(py_b) || (py_a != NULL && !PySequence_Size(py_a)))
 	{
 		PyErr_SetString(PyExc_ValueError, "The sequence has to contain at least one value!");
 		return NULL;
@@ -862,7 +862,7 @@
 	float value;
 	int result;
 
-	for(int i = 0; i < PySequence_Length(py_b); i++)
+	for(int i = 0; i < PySequence_Size(py_b); i++)
 	{
 		py_value = PySequence_GetItem(py_b, i);
 		result = PyArg_Parse(py_value, "f:filter", &value);
@@ -876,7 +876,7 @@
 
 	if(py_a)
 	{
-		for(int i = 0; i < PySequence_Length(py_a); i++)
+		for(int i = 0; i < PySequence_Size(py_a); i++)
 		{
 			py_value = PySequence_GetItem(py_a, i);
 			result = PyArg_Parse(py_value, "f:filter", &value);

Modified: trunk/blender/source/blender/python/generic/IDProp.c
===================================================================
--- trunk/blender/source/blender/python/generic/IDProp.c	2011-01-09 14:30:16 UTC (rev 34194)
+++ trunk/blender/source/blender/python/generic/IDProp.c	2011-01-09 14:53:18 UTC (rev 34195)
@@ -261,7 +261,7 @@
 	PyObject *item;
 	int type= IDP_INT;
 
-	int i, len = PySequence_Length(seq);
+	int i, len = PySequence_Size(seq);
 	for (i=0; i < len; i++) {
 		item = PySequence_GetItem(seq, i);
 		if (PyFloat_Check(item)) {
@@ -331,7 +331,7 @@
 		we assume IDP_INT unless we hit a float
 		number; then we assume it's */
 
-		val.array.len = PySequence_Length(ob);
+		val.array.len = PySequence_Size(ob);
 
 		switch(val.array.type) {
 		case IDP_DOUBLE:

Modified: trunk/blender/source/blender/python/generic/bgl.c
===================================================================
--- trunk/blender/source/blender/python/generic/bgl.c	2011-01-09 14:30:16 UTC (rev 34194)
+++ trunk/blender/source/blender/python/generic/bgl.c	2011-01-09 14:53:18 UTC (rev 34195)
@@ -207,7 +207,7 @@
 		ndimensions= 1;
 		dimensions[0]= PyLong_AsLong(length_ob);
 	} else if (PySequence_Check(length_ob)) {
-		ndimensions= PySequence_Length(length_ob);
+		ndimensions= PySequence_Size(length_ob);
 		if (ndimensions > MAX_DIMENSIONS) {
 			PyErr_SetString(PyExc_AttributeError, "too many dimensions, max is 256");
 			return NULL;
@@ -360,8 +360,8 @@
 		return -1;
 	}
 
-	if (PySequence_Length(seq)!=(end-begin)) {
-		int seq_len = PySequence_Length(seq);
+	if (PySequence_Size(seq)!=(end-begin)) {
+		int seq_len = PySequence_Size(seq);
 		char err_str[128];
 		sprintf(err_str, "size mismatch in assignment. Expected size: %d (size provided: %d)", seq_len, (end-begin));
 		PyErr_SetString(PyExc_TypeError, err_str);

Modified: trunk/blender/source/blender/python/generic/mathutils_vector.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_vector.c	2011-01-09 14:30:16 UTC (rev 34194)
+++ trunk/blender/source/blender/python/generic/mathutils_vector.c	2011-01-09 14:53:18 UTC (rev 34195)
@@ -844,7 +844,7 @@
 	CLAMP(end, 0, self->size);
 	begin = MIN2(begin,end);
 
-	size = PySequence_Length(seq);
+	size = PySequence_Size(seq);
 	if(size != (end - begin)){
 		PyErr_SetString(PyExc_TypeError, "vector[begin:end] = []: size mismatch in slice assignment");
 		return -1;

Modified: trunk/blender/source/blender/python/intern/bpy_props.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_props.c	2011-01-09 14:30:16 UTC (rev 34194)
+++ trunk/blender/source/blender/python/intern/bpy_props.c	2011-01-09 14:53:18 UTC (rev 34195)
@@ -552,7 +552,7 @@
 		return NULL;
 	}
 
-	seq_len= PySequence_Length(value);
+	seq_len= PySequence_Size(value);
 
 	if(is_enum_flag) {
 		if(seq_len > RNA_ENUM_BITFLAG_SIZE) {

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2011-01-09 14:30:16 UTC (rev 34194)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2011-01-09 14:53:18 UTC (rev 34195)
@@ -1250,7 +1250,7 @@
 				return -1;
 			}
 
-			seq_len = PySequence_Length(value);
+			seq_len = PySequence_Size(value);
 			for(i=0; i<seq_len; i++) {
 				item= PySequence_GetItem(value, i);
 
@@ -3279,7 +3279,7 @@
 		return -1;
 	}
 
-	*tot= PySequence_Length(*seq); // TODO - buffer may not be a sequence! array.array() is tho.
+	*tot= PySequence_Size(*seq); // TODO - buffer may not be a sequence! array.array() is tho.
 
 	if(*tot>0) {
 		foreach_attr_type(self, *attr, raw_type, attr_tot, attr_signed);

Modified: trunk/blender/source/blender/python/intern/bpy_rna_array.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna_array.c	2011-01-09 14:30:16 UTC (rev 34194)
+++ trunk/blender/source/blender/python/intern/bpy_rna_array.c	2011-01-09 14:53:18 UTC (rev 34195)
@@ -57,7 +57,7 @@
 	if (dim + 1 < totdim) {
 		/* check that a sequence contains dimsize[dim] items */
 
-		for (i= 0; i < PySequence_Length(seq); i++) {
+		for (i= 0; i < PySequence_Size(seq); i++) {
 			PyObject *item;
 			int ok= 1;
 			item= PySequence_GetItem(seq, i);
@@ -72,7 +72,7 @@
 			   dimsize[2]=5
 		   
 			   dim=0 */
-			else if (PySequence_Length(item) != dimsize[dim + 1]) {
+			else if (PySequence_Size(item) != dimsize[dim + 1]) {
 				/* BLI_snprintf(error_str, error_str_size, "sequences of dimension %d should contain %d items", (int)dim + 1, (int)dimsize[dim + 1]); */
 				PyErr_Format(PyExc_ValueError, "%s sequences of dimension %d should contain %d items", error_prefix, (int)dim + 1, (int)dimsize[dim + 1]);
 				ok= 0;
@@ -89,7 +89,7 @@
 	}
 	else {
 		/* check that items are of correct type */
-		for (i= 0; i < PySequence_Length(seq); i++) {
+		for (i= 0; i < PySequence_Size(seq); i++) {
 			PyObject *item= PySequence_GetItem(seq, i);
 
 			if (!check_item_type(item)) {
@@ -114,7 +114,7 @@
 
 	if (PySequence_Check(seq)) {
 		int i;
-		for (i= 0; i < PySequence_Length(seq); i++) {
+		for (i= 0; i < PySequence_Size(seq); i++) {
 			PyObject *item= PySequence_GetItem(seq, i);
 			totitem += count_items(item);
 			Py_DECREF(item);
@@ -211,7 +211,7 @@
 	unsigned int i;
 	int totdim= RNA_property_array_dimension(ptr, prop, NULL);
 
-	for (i= 0; i < PySequence_Length(seq); i++) {
+	for (i= 0; i < PySequence_Size(seq); i++) {
 		PyObject *item= PySequence_GetItem(seq, i);
 
 		if (dim + 1 < totdim) {

Modified: trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.cpp	2011-01-09 14:30:16 UTC (rev 34194)
+++ trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.cpp	2011-01-09 14:53:18 UTC (rev 34195)
@@ -80,7 +80,7 @@
 static int setColor (PyFilter * self, PyObject * value, void * closure)
 {
 	// check validity of parameter
-	if (value == NULL || !PySequence_Check(value) || PySequence_Length(value) != 3
+	if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 3
 		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 0))
 		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 1))
 		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 2)))
@@ -107,7 +107,7 @@
 static int setLimits (PyFilter * self, PyObject * value, void * closure)
 {
 	// check validity of parameter
-	if (value == NULL || !PySequence_Check(value) || PySequence_Length(value) != 2
+	if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 2
 		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 0))
 		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 1)))
 	{

Modified: trunk/blender/source/gameengine/VideoTexture/FilterColor.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/FilterColor.cpp	2011-01-09 14:30:16 UTC (rev 34194)
+++ trunk/blender/source/gameengine/VideoTexture/FilterColor.cpp	2011-01-09 14:53:18 UTC (rev 34195)
@@ -129,14 +129,14 @@
 	ColorMatrix mat;
 	// check validity of parameter
 	bool valid = value != NULL && PySequence_Check(value)
-		&& PySequence_Length(value) == 4;
+		&& PySequence_Size(value) == 4;
 	// check rows
 	for (int r = 0; valid && r < 4; ++r)
 	{
 		// get row object
 		PyObject * row = PySequence_Fast_GET_ITEM(value, r);
 		// check sequence
-		valid = PySequence_Check(row) && PySequence_Length(row) == 5;
+		valid = PySequence_Check(row) && PySequence_Size(row) == 5;
 		// check items
 		for (int c = 0; valid && c < 5; ++c)
 		{
@@ -262,14 +262,14 @@
 	ColorLevel lev;
 	// check validity of parameter
 	bool valid = value != NULL && PySequence_Check(value)
-		&& PySequence_Length(value) == 4;
+		&& PySequence_Size(value) == 4;
 	// check rows
 	for (int r = 0; valid && r < 4; ++r)
 	{
 		// get row object
 		PyObject * row = PySequence_Fast_GET_ITEM(value, r);
 		// check sequence
-		valid = PySequence_Check(row) && PySequence_Length(row) == 2;
+		valid = PySequence_Check(row) && PySequence_Size(row) == 2;
 		// check items
 		for (int c = 0; valid && c < 2; ++c)
 		{

Modified: trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp	2011-01-09 14:30:16 UTC (rev 34194)
+++ trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp	2011-01-09 14:53:18 UTC (rev 34195)
@@ -336,7 +336,7 @@
 static int setBackground (PyImage * self, PyObject * value, void * closure)
 {
 	// check validity of parameter
-	if (value == NULL || !PySequence_Check(value) || PySequence_Length(value) != 4
+	if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 4
 		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 0))
 		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 1))
 		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 2))

Modified: trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp	2011-01-09 14:30:16 UTC (rev 34194)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list