[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35120] trunk/blender/source/blender/ python/intern: remove 2 unnecessary checks for array type before assignment .

[Campbell Barton]

Revision: 35120
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35120
Author:   campbellbarton
Date:     2011-02-24 07:25:47 +0000 (Thu, 24 Feb 2011)
Log Message:
-----------
remove 2 unnecessary checks for array type before assignment. 

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_rna.c
    trunk/blender/source/blender/python/intern/bpy_rna_array.c

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2011-02-24 05:46:57 UTC (rev 35119)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2011-02-24 07:25:47 UTC (rev 35120)
@@ -1046,17 +1046,11 @@
 		/* char error_str[512]; */
 		int ok= 1;
 
-#ifdef USE_MATHUTILS
-		if(MatrixObject_Check(value)) {
-			MatrixObject *mat = (MatrixObject*)value;
-			if(!BaseMath_ReadCallback(mat))
-				return -1;
-		} else /* continue... */
-#endif // USE_MATHUTILS
-		if (!PySequence_Check(value)) {
-			PyErr_Format(PyExc_TypeError, "%.200s RNA array assignment to %.200s.%.200s expected a sequence, not %.200s", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), Py_TYPE(value)->tp_name);
-			return -1;
-		}
+//		if (!PySequence_Check(value)) {
+//			PyErr_Format(PyExc_TypeError, "%.200s RNA array assignment to %.200s.%.200s expected a sequence, not %.200s", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), Py_TYPE(value)->tp_name);
+//			return -1;
+//		}
+
 		/* done getting the length */
 		ok= pyrna_py_to_array(ptr, prop, data, value, error_prefix);
 

Modified: trunk/blender/source/blender/python/intern/bpy_rna_array.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna_array.c	2011-02-24 05:46:57 UTC (rev 35119)
+++ trunk/blender/source/blender/python/intern/bpy_rna_array.c	2011-02-24 07:25:47 UTC (rev 35120)
@@ -98,7 +98,7 @@
 				Py_DECREF(item);
 
 				/* BLI_snprintf(error_str, error_str_size, "sequence items should be of type %s", item_type_str); */
-				PyErr_Format(PyExc_TypeError, "expected sequence items of type %s, not %s", item_type_str, Py_TYPE(item)->tp_name);
+				PyErr_Format(PyExc_TypeError, "%s expected sequence items of type %s, not %s", error_prefix, item_type_str, Py_TYPE(item)->tp_name);
 				return 0;
 			}
 
@@ -186,7 +186,7 @@
 
 		if (tot != len) {
 			/* BLI_snprintf(error_str, error_str_size, "sequence must have length of %d", len); */
-			PyErr_Format(PyExc_ValueError, "%s sequence must have %d items total, not %d", error_prefix, len, tot);
+			PyErr_Format(PyExc_ValueError, "%s %.200s.%.200s, sequence must have %d items total, not %d", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), len, tot);
 			return 0;
 		}
 	}
@@ -315,7 +315,7 @@
 
 	if(lvalue_dim == totdim) { /* single item, assign directly */
 		if(!check_item_type(py)) {
-			PyErr_Format(PyExc_TypeError, "%s expected a %s type, not %s", error_prefix, item_type_str, Py_TYPE(py)->tp_name);
+			PyErr_Format(PyExc_TypeError, "%s %.200s.%.200s, expected a %s type, not %s", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), item_type_str, Py_TYPE(py)->tp_name);
 			return 0;
 		}
 		copy_value_single(py, ptr, prop, NULL, 0, &index, convert_item, rna_set_index);