remove python2.x support
[blender.git] / source / blender / python / intern / bpy_rna.c
index bebb745a27eb7789e1f7877ed73f9bb9998bf716..6c959b9f42c3eeea44f0e289ebe42f079a3c0225 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 #include "bpy_rna.h"
-#include "bpy_compat.h"
 #include "bpy_util.h"
 //#include "blendef.h"
 #include "BLI_dynstr.h"
@@ -171,7 +170,7 @@ static PyObject *pyrna_struct_repr( BPy_StructRNA * self )
        char *name;
 
        /* print name if available */
-       name= RNA_struct_name_get_alloc(&self->ptr, NULL, 0);
+       name= RNA_struct_name_get_alloc(&self->ptr, NULL, FALSE);
        if(name) {
                pyob= PyUnicode_FromFormat( "[BPy_StructRNA \"%.200s\" -> \"%.200s\"]", RNA_struct_identifier(self->ptr.type), name);
                MEM_freeN(name);
@@ -190,7 +189,7 @@ static PyObject *pyrna_prop_repr( BPy_PropertyRNA * self )
        /* if a pointer, try to print name of pointer target too */
        if(RNA_property_type(self->prop) == PROP_POINTER) {
                ptr= RNA_property_pointer_get(&self->ptr, self->prop);
-               name= RNA_struct_name_get_alloc(&ptr, NULL, 0);
+               name= RNA_struct_name_get_alloc(&ptr, NULL, FALSE);
 
                if(name) {
                        pyob= PyUnicode_FromFormat( "[BPy_PropertyRNA \"%.200s\" -> \"%.200s\" -> \"%.200s\" ]", RNA_struct_identifier(self->ptr.type), RNA_property_identifier(self->prop), name);
@@ -225,7 +224,7 @@ static char *pyrna_enum_as_string(PointerRNA *ptr, PropertyRNA *prop)
 {
        EnumPropertyItem *item;
        char *result;
-       int free= 0;
+       int free= FALSE;
        
        RNA_property_enum_items(BPy_GetContext(), ptr, prop, &item, NULL, &free);
        if(item) {
@@ -258,31 +257,31 @@ PyObject * pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop)
                        switch(RNA_property_subtype(prop)) {
                        case PROP_VECTOR:
                                if(len>=2 && len <= 4) {
-                                       PyObject *vec_cb= newVectorObject_cb(ret, len, mathutils_rna_array_cb_index, 0);
+                                       PyObject *vec_cb= newVectorObject_cb(ret, len, mathutils_rna_array_cb_index, FALSE);
                                        Py_DECREF(ret); /* the vector owns now */
                                        ret= vec_cb; /* return the vector instead */
                                }
                                break;
                        case PROP_MATRIX:
                                if(len==16) {
-                                       PyObject *mat_cb= newMatrixObject_cb(ret, 4,4, mathutils_rna_matrix_cb_index, 0);
+                                       PyObject *mat_cb= newMatrixObject_cb(ret, 4,4, mathutils_rna_matrix_cb_index, FALSE);
                                        Py_DECREF(ret); /* the matrix owns now */
                                        ret= mat_cb; /* return the matrix instead */
                                }
                                else if (len==9) {
-                                       PyObject *mat_cb= newMatrixObject_cb(ret, 3,3, mathutils_rna_matrix_cb_index, 0);
+                                       PyObject *mat_cb= newMatrixObject_cb(ret, 3,3, mathutils_rna_matrix_cb_index, FALSE);
                                        Py_DECREF(ret); /* the matrix owns now */
                                        ret= mat_cb; /* return the matrix instead */
                                }
                                break;
                        case PROP_ROTATION:
                                if(len==3) { /* euler */
-                                       PyObject *eul_cb= newEulerObject_cb(ret, mathutils_rna_array_cb_index, 0);
+                                       PyObject *eul_cb= newEulerObject_cb(ret, mathutils_rna_array_cb_index, FALSE);
                                        Py_DECREF(ret); /* the matrix owns now */
                                        ret= eul_cb; /* return the matrix instead */
                                }
                                else if (len==4) {
-                                       PyObject *quat_cb= newQuaternionObject_cb(ret, mathutils_rna_array_cb_index, 0);
+                                       PyObject *quat_cb= newQuaternionObject_cb(ret, mathutils_rna_array_cb_index, FALSE);
                                        Py_DECREF(ret); /* the matrix owns now */
                                        ret= quat_cb; /* return the matrix instead */
                                }
@@ -325,7 +324,7 @@ PyObject * pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop)
                        ret = PyUnicode_FromString( identifier );
                } else {
                        EnumPropertyItem *item;
-                       int free= 0;
+                       int free= FALSE;
 
                        /* don't throw error here, can't trust blender 100% to give the
                         * right values, python code should not generate error for that */
@@ -375,9 +374,9 @@ PyObject * pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop)
        return ret;
 }
 
-/* This function is only used by operators right now
- * Its used for taking keyword args and filling in property values */
-int pyrna_pydict_to_props(PointerRNA *ptr, PyObject *kw, const char *error_prefix)
+/* This function is used by operators and converting dicts into collections.
+ * Its takes keyword args and fills them with property values */
+int pyrna_pydict_to_props(PointerRNA *ptr, PyObject *kw, int all_args, const char *error_prefix)
 {
        int error_val = 0;
        int totkw;
@@ -397,20 +396,21 @@ int pyrna_pydict_to_props(PointerRNA *ptr, PyObject *kw, const char *error_prefi
                        break;
                }
 
-               item= PyDict_GetItemString(kw, arg_name);
+               item= PyDict_GetItemString(kw, arg_name); /* wont set an error */
 
                if (item == NULL) {
-                       PyErr_Format( PyExc_TypeError, "%.200s: keyword \"%.200s\" missing", error_prefix, arg_name ? arg_name : "<UNKNOWN>");
-                       error_val = -1; /* pyrna_py_to_prop sets the error */
-                       break;
-               }
-
-               if (pyrna_py_to_prop(ptr, prop, NULL, item)) {
-                       error_val= -1;
-                       break;
+                       if(all_args) {
+                               PyErr_Format( PyExc_TypeError, "%.200s: keyword \"%.200s\" missing", error_prefix, arg_name ? arg_name : "<UNKNOWN>");
+                               error_val = -1; /* pyrna_py_to_prop sets the error */
+                               break;
+                       }
+               } else {
+                       if (pyrna_py_to_prop(ptr, prop, NULL, item, error_prefix)) {
+                               error_val= -1;
+                               break;
+                       }
+                       totkw--;
                }
-
-               totkw--;
        }
        RNA_STRUCT_END;
 
@@ -458,7 +458,7 @@ PyObject *pyrna_func_to_py(BPy_StructRNA *pyrna, FunctionRNA *func)
 }
 
 
-int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *value)
+int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *value, const char *error_prefix)
 {
        /* XXX hard limits should be checked here */
        int type = RNA_property_type(prop);
@@ -483,13 +483,13 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                        py_len= (int)PySequence_Length(value);
                }
                else {
-                       PyErr_Format(PyExc_TypeError, "RNA array assignment expected a sequence instead of %.200s instance.", Py_TYPE(value)->tp_name);
+                       PyErr_Format(PyExc_TypeError, "%.200s RNA array assignment expected a sequence instead of %.200s instance.", error_prefix, Py_TYPE(value)->tp_name);
                        return -1;
                }
                /* done getting the length */
                
                if (py_len != len) {
-                       PyErr_Format(PyExc_TypeError, "python sequence length %d did not match the RNA array length %d.", py_len, len);
+                       PyErr_Format(PyExc_TypeError, "%.200s python sequence length %d did not match the RNA array length %d.", error_prefix, py_len, len);
                        return -1;
                }
                
@@ -511,7 +511,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                                if (param_arr[i] < 0) {
                                        if(data==NULL)
                                                MEM_freeN(param_arr);
-                                       PyErr_SetString(PyExc_AttributeError, "one or more of the values in the sequence is not a boolean");
+                                       PyErr_Format(PyExc_AttributeError, "%.200s one or more of the values in the sequence is not a boolean", error_prefix);
                                        return -1;
                                }
                        }
@@ -539,7 +539,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                        if (PyErr_Occurred()) {
                                if(data==NULL)
                                        MEM_freeN(param_arr);
-                               PyErr_SetString(PyExc_AttributeError, "one or more of the values in the sequence could not be used as an int");
+                               PyErr_Format(PyExc_AttributeError, "%.200s one or more of the values in the sequence could not be used as an int", error_prefix);
                                return -1;
                        }
                        if(data==NULL) {
@@ -573,7 +573,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                        if (PyErr_Occurred()) {
                                if(data==NULL)
                                        MEM_freeN(param_arr);
-                               PyErr_SetString(PyExc_AttributeError, "one or more of the values in the sequence could not be used as a float");
+                               PyErr_Format(PyExc_AttributeError, "%.200s one or more of the values in the sequence could not be used as a float", error_prefix);
                                return -1;
                        }
                        if(data==NULL) {
@@ -593,7 +593,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                        int param = PyObject_IsTrue( value );
                        
                        if( param < 0 ) {
-                               PyErr_SetString(PyExc_TypeError, "expected True/False or 0/1");
+                               PyErr_Format(PyExc_TypeError, "%.200s expected True/False or 0/1", error_prefix);
                                return -1;
                        } else {
                                if(data)        *((int*)data)= param;
@@ -605,7 +605,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                {
                        int param = PyLong_AsSsize_t(value);
                        if (PyErr_Occurred()) {
-                               PyErr_SetString(PyExc_TypeError, "expected an int type");
+                               PyErr_Format(PyExc_TypeError, "%.200s expected an int type", error_prefix);
                                return -1;
                        } else {
                                if(data)        *((int*)data)= param;
@@ -617,7 +617,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                {
                        float param = PyFloat_AsDouble(value);
                        if (PyErr_Occurred()) {
-                               PyErr_SetString(PyExc_TypeError, "expected a float type");
+                               PyErr_Format(PyExc_TypeError, "%.200s expected a float type", error_prefix);
                                return -1;
                        } else {
                                if(data)        *((float*)data)= param;
@@ -630,7 +630,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                        char *param = _PyUnicode_AsString(value);
                        
                        if (param==NULL) {
-                               PyErr_SetString(PyExc_TypeError, "expected a string type");
+                               PyErr_Format(PyExc_TypeError, "%.200s expected a string type", error_prefix);
                                return -1;
                        } else {
                                if(data)        *((char**)data)= param;
@@ -644,7 +644,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                        
                        if (param==NULL) {
                                char *enum_str= pyrna_enum_as_string(ptr, prop);
-                               PyErr_Format(PyExc_TypeError, "expected a string enum type in (%.200s)", enum_str);
+                               PyErr_Format(PyExc_TypeError, "%.200s expected a string enum type in (%.200s)", error_prefix, enum_str);
                                MEM_freeN(enum_str);
                                return -1;
                        } else {
@@ -654,7 +654,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                                        else            RNA_property_enum_set(ptr, prop, val);
                                } else {
                                        char *enum_str= pyrna_enum_as_string(ptr, prop);
-                                       PyErr_Format(PyExc_TypeError, "enum \"%.200s\" not found in (%.200s)", param, enum_str);
+                                       PyErr_Format(PyExc_TypeError, "%.200s enum \"%.200s\" not found in (%.200s)", error_prefix, param, enum_str);
                                        MEM_freeN(enum_str);
                                        return -1;
                                }
@@ -669,11 +669,11 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                        if(!BPy_StructRNA_Check(value) && value != Py_None) {
                                PointerRNA tmp;
                                RNA_pointer_create(NULL, ptype, NULL, &tmp);
-                               PyErr_Format(PyExc_TypeError, "expected a %.200s type", RNA_struct_identifier(tmp.type));
+                               PyErr_Format(PyExc_TypeError, "%.200s expected a %.200s type", error_prefix, RNA_struct_identifier(tmp.type));
                                return -1;
                        } else {
                                BPy_StructRNA *param= (BPy_StructRNA*)value;
-                               int raise_error= 0;
+                               int raise_error= FALSE;
                                if(data) {
                                        int flag = RNA_property_flag(prop);
 
@@ -690,7 +690,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                                                *((void**)data)= param->ptr.data;
                                        }
                                        else {
-                                               raise_error= 1;
+                                               raise_error= TRUE;
                                        }
                                }
                                else {
@@ -706,7 +706,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                                        else {
                                                PointerRNA tmp;
                                                RNA_pointer_create(NULL, ptype, NULL, &tmp);
-                                               PyErr_Format(PyExc_TypeError, "expected a %.200s type", RNA_struct_identifier(tmp.type));
+                                               PyErr_Format(PyExc_TypeError, "%.200s expected a %.200s type", error_prefix, RNA_struct_identifier(tmp.type));
                                                return -1;
                                        }
                                }
@@ -714,7 +714,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                                if(raise_error) {
                                        PointerRNA tmp;
                                        RNA_pointer_create(NULL, ptype, NULL, &tmp);
-                                       PyErr_Format(PyExc_TypeError, "expected a %.200s type", RNA_struct_identifier(tmp.type));
+                                       PyErr_Format(PyExc_TypeError, "%.200s expected a %.200s type", error_prefix, RNA_struct_identifier(tmp.type));
                                        return -1;
                                }
                        }
@@ -732,7 +732,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                        
                        /* convert a sequence of dict's into a collection */
                        if(!PySequence_Check(value)) {
-                               PyErr_SetString(PyExc_TypeError, "expected a sequence of dicts for an RNA collection");
+                               PyErr_Format(PyExc_TypeError, "%.200s expected a sequence of dicts for an RNA collection", error_prefix);
                                return -1;
                        }
                        
@@ -740,7 +740,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                        for(i=0; i<seq_len; i++) {
                                item= PySequence_GetItem(value, i);
                                if(item==NULL || PyDict_Check(item)==0) {
-                                       PyErr_SetString(PyExc_TypeError, "expected a sequence of dicts for an RNA collection");
+                                       PyErr_Format(PyExc_TypeError, "%.200s expected a sequence of dicts for an RNA collection", error_prefix);
                                        Py_XDECREF(item);
                                        return -1;
                                }
@@ -753,7 +753,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                                else
                                        RNA_property_collection_add(ptr, prop, &itemptr);
 
-                               if(pyrna_pydict_to_props(&itemptr, item, "Converting a python list to an RNA collection")==-1) {
+                               if(pyrna_pydict_to_props(&itemptr, item, 1, "Converting a python list to an RNA collection")==-1) {
                                        Py_DECREF(item);
                                        return -1;
                                }
@@ -763,7 +763,7 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
                        break;
                }
                default:
-                       PyErr_SetString(PyExc_AttributeError, "unknown property type (pyrna_py_to_prop)");
+                       PyErr_Format(PyExc_AttributeError, "%.200s unknown property type (pyrna_py_to_prop)", error_prefix);
                        return -1;
                        break;
                }
@@ -903,10 +903,6 @@ static PyObject *prop_subscript_collection_str(BPy_PropertyRNA * self, char *key
 }
 /* static PyObject *prop_subscript_array_str(BPy_PropertyRNA * self, char *keyname) */
 
-
-
-
-#if PY_VERSION_HEX >= 0x03000000
 static PyObject *prop_subscript_collection_slice(BPy_PropertyRNA * self, int start, int stop)
 {
        PointerRNA newptr;
@@ -941,7 +937,6 @@ static PyObject *prop_subscript_array_slice(BPy_PropertyRNA * self, int start, i
 
        return list;
 }
-#endif
 
 static PyObject *prop_subscript_collection(BPy_PropertyRNA * self, PyObject *key)
 {
@@ -955,7 +950,6 @@ static PyObject *prop_subscript_collection(BPy_PropertyRNA * self, PyObject *key
 
                return prop_subscript_collection_int(self, i);
        }
-#if PY_VERSION_HEX >= 0x03000000
        else if (PySlice_Check(key)) {
                int len= RNA_property_collection_length(&self->ptr, self->prop);
                Py_ssize_t start, stop, step, slicelength;
@@ -974,7 +968,6 @@ static PyObject *prop_subscript_collection(BPy_PropertyRNA * self, PyObject *key
                        return NULL;
                }
        }
-#endif
        else {
                PyErr_Format(PyExc_TypeError, "invalid rna key, key must be a string or an int instead of %.200s instance.", Py_TYPE(key)->tp_name);
                return NULL;
@@ -992,7 +985,6 @@ static PyObject *prop_subscript_array(BPy_PropertyRNA * self, PyObject *key)
                        return NULL;
                return prop_subscript_array_int(self, PyLong_AsSsize_t(key));
        }
-#if PY_VERSION_HEX >= 0x03000000
        else if (PySlice_Check(key)) {
                int len= RNA_property_array_length(self->prop);
                Py_ssize_t start, stop, step, slicelength;
@@ -1011,7 +1003,6 @@ static PyObject *prop_subscript_array(BPy_PropertyRNA * self, PyObject *key)
                        return NULL;
                }
        }
-#endif
        else {
                PyErr_SetString(PyExc_AttributeError, "invalid key, key must be an int");
                return NULL;
@@ -1031,7 +1022,6 @@ static PyObject *pyrna_prop_subscript( BPy_PropertyRNA * self, PyObject *key )
 
 }
 
-#if PY_VERSION_HEX >= 0x03000000
 static int prop_subscript_ass_array_slice(BPy_PropertyRNA * self, int begin, int end, PyObject *value)
 {
        int count;
@@ -1048,7 +1038,6 @@ static int prop_subscript_ass_array_slice(BPy_PropertyRNA * self, int begin, int
 
        return 0;
 }
-#endif
 
 static int prop_subscript_ass_array_int(BPy_PropertyRNA * self, int keynum, PyObject *value)
 {
@@ -1086,7 +1075,6 @@ static int pyrna_prop_ass_subscript( BPy_PropertyRNA * self, PyObject *key, PyOb
 
                return prop_subscript_ass_array_int(self, i, value);
        }
-#if PY_VERSION_HEX >= 0x03000000
        else if (PySlice_Check(key)) {
                int len= RNA_property_array_length(self->prop);
                Py_ssize_t start, stop, step, slicelength;
@@ -1105,7 +1093,6 @@ static int pyrna_prop_ass_subscript( BPy_PropertyRNA * self, PyObject *key, PyOb
                        return -1;
                }
        }
-#endif
        else {
                PyErr_SetString(PyExc_AttributeError, "invalid key, key must be an int");
                return -1;
@@ -1341,7 +1328,7 @@ static int pyrna_struct_setattro( BPy_StructRNA * self, PyObject *pyname, PyObje
        }
                
        /* pyrna_py_to_prop sets its own exceptions */
-       return pyrna_py_to_prop(&self->ptr, prop, NULL, value);
+       return pyrna_py_to_prop(&self->ptr, prop, NULL, value, "StructRNA - Attribute (setattr):");
 }
 
 static PyObject *pyrna_prop_keys(BPy_PropertyRNA *self)
@@ -1457,7 +1444,7 @@ static PyObject *pyrna_prop_get(BPy_PropertyRNA *self, PyObject *args)
 }
 
 
-#if (PY_VERSION_HEX >= 0x03000000) /* foreach needs py3 */
+
 static void foreach_attr_type( BPy_PropertyRNA *self, char *attr,
                                                                        /* values to assign */
                                                                        RawPropertyType *raw_type, int *attr_tot, int *attr_signed )
@@ -1465,13 +1452,13 @@ static void foreach_attr_type(  BPy_PropertyRNA *self, char *attr,
        PropertyRNA *prop;
        *raw_type= -1;
        *attr_tot= 0;
-       *attr_signed= 0;
+       *attr_signed= FALSE;
 
        RNA_PROP_BEGIN(&self->ptr, itemptr, self->prop) {
                prop = RNA_struct_find_property(&itemptr, attr);
                *raw_type= RNA_property_raw_type(prop);
                *attr_tot = RNA_property_array_length(prop);
-               *attr_signed= (RNA_property_subtype(prop)==PROP_UNSIGNED) ? 0:1;
+               *attr_signed= (RNA_property_subtype(prop)==PROP_UNSIGNED) ? FALSE:TRUE;
                break;
        }
        RNA_PROP_END;
@@ -1489,7 +1476,7 @@ static int foreach_parse_args(
        int target_tot;
 #endif
 
-       *size= *raw_type= *attr_tot= *attr_signed= 0;
+       *size= *raw_type= *attr_tot= *attr_signed= FALSE;
 
        if(!PyArg_ParseTuple(args, "sO", attr, seq) || (!PySequence_Check(*seq) && PyObject_CheckBuffer(*seq))) {
                PyErr_SetString( PyExc_TypeError, "foreach_get(attr, sequence) expects a string and a sequence" );
@@ -1569,7 +1556,7 @@ static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set)
 
 
        if(set) { /* get the array from python */
-               buffer_is_compat = 0;
+               buffer_is_compat = FALSE;
                if(PyObject_CheckBuffer(seq)) {
                        Py_buffer buf;
                        PyObject_GetBuffer(seq, &buf, PyBUF_SIMPLE | PyBUF_FORMAT);
@@ -1616,7 +1603,7 @@ static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set)
                }
        }
        else {
-               buffer_is_compat = 0;
+               buffer_is_compat = FALSE;
                if(PyObject_CheckBuffer(seq)) {
                        Py_buffer buf;
                        PyObject_GetBuffer(seq, &buf, PyBUF_SIMPLE | PyBUF_FORMAT);
@@ -1692,7 +1679,6 @@ static  PyObject *pyrna_prop_foreach_set(BPy_PropertyRNA *self, PyObject *args)
 {
        return foreach_getset(self, args, 1);
 }
-#endif /* #if (PY_VERSION_HEX >= 0x03000000) */
 
 /* A bit of a kludge, make a list out of a collection or array,
  * then return the lists iter function, not especially fast but convenient for now */
@@ -1743,11 +1729,10 @@ static struct PyMethodDef pyrna_prop_methods[] = {
        
        {"get", (PyCFunction)pyrna_prop_get, METH_VARARGS, NULL},
 
-#if (PY_VERSION_HEX >= 0x03000000)
        /* array accessor function */
        {"foreach_get", (PyCFunction)pyrna_prop_foreach_get, METH_VARARGS, NULL},
        {"foreach_set", (PyCFunction)pyrna_prop_foreach_set, METH_VARARGS, NULL},
-#endif
+
        {NULL, NULL, 0, NULL}
 };
 
@@ -1867,8 +1852,12 @@ PyObject *pyrna_param_to_py(PointerRNA *ptr, PropertyRNA *prop, void *data)
                                newptr= *(PointerRNA*)data;
                        }
                        else {
-                               /* XXX this is missing the ID part! */
-                               RNA_pointer_create(NULL, type, *(void**)data, &newptr);
+                               if(RNA_struct_is_ID(type)) {
+                                       RNA_id_pointer_create(*(void**)data, &newptr);
+                               } else {
+                                       /* XXX this is missing the ID part! */
+                                       RNA_pointer_create(NULL, type, *(void**)data, &newptr);
+                               }
                        }
 
                        if (newptr.data) {
@@ -1915,7 +1904,7 @@ static PyObject * pyrna_func_call(PyObject * self, PyObject *args, PyObject *kw)
        ParameterIterator iter;
        PropertyRNA *pret, *parm;
        PyObject *ret, *item;
-       int i, args_len, parms_len, flag, err= 0, kw_tot= 0;
+       int i, args_len, parms_len, flag, err= 0, kw_tot= 0, kw_arg;
        const char *parm_id;
        void *retdata= NULL;
 
@@ -1926,7 +1915,7 @@ static PyObject * pyrna_func_call(PyObject * self, PyObject *args, PyObject *kw)
        }
        
        if(self_func==NULL) {
-               PyErr_Format(PyExc_RuntimeError, "%.200s.???(): rna function internal function is NULL, this is a bug. aborting", RNA_struct_identifier(self_ptr->type));
+               PyErr_Format(PyExc_RuntimeError, "%.200s.<unknown>(): rna function internal function is NULL, this is a bug. aborting", RNA_struct_identifier(self_ptr->type));
                return NULL;
        }
        
@@ -1961,11 +1950,15 @@ static PyObject * pyrna_func_call(PyObject * self, PyObject *args, PyObject *kw)
                if ((i < args_len) && (flag & PROP_REQUIRED)) {
                        item= PyTuple_GET_ITEM(args, i);
                        i++;
+
+                       kw_arg= FALSE;
                }
                else if (kw != NULL) {
                        item= PyDict_GetItemString(kw, parm_id);  /* borrow ref */
                        if(item)
                                kw_tot++; /* make sure invalid keywords are not given */
+
+                       kw_arg= TRUE;
                }
 
                if (item==NULL) {
@@ -1978,10 +1971,23 @@ static PyObject * pyrna_func_call(PyObject * self, PyObject *args, PyObject *kw)
                                continue;
                }
 
-               err= pyrna_py_to_prop(&funcptr, parm, iter.data, item);
+               err= pyrna_py_to_prop(&funcptr, parm, iter.data, item, "");
+
+               if(err!=0) {
+                       /* the error generated isnt that useful, so generate it again with a useful prefix
+                        * could also write a function to prepend to error messages */
+                       char error_prefix[512];
+                       PyErr_Clear(); /* re-raise */
+
+                       if(kw_arg==TRUE)
+                               snprintf(error_prefix, sizeof(error_prefix), "%s.%s(): error with keyword argument \"%s\" - ", RNA_struct_identifier(self_ptr->type), RNA_function_identifier(self_func), parm_id);
+                       else
+                               snprintf(error_prefix, sizeof(error_prefix), "%s.%s(): error with argument %d, \"%s\" - ", RNA_struct_identifier(self_ptr->type), RNA_function_identifier(self_func), i, parm_id);
+
+                       pyrna_py_to_prop(&funcptr, parm, iter.data, item, error_prefix);
 
-               if(err!=0)
                        break;
+               }
        }
 
 
@@ -1996,12 +2002,12 @@ static PyObject * pyrna_func_call(PyObject * self, PyObject *args, PyObject *kw)
                DynStr *good_args= BLI_dynstr_new();
 
                char *arg_name, *bad_args_str, *good_args_str;
-               int found= 0, first=1;
+               int found= FALSE, first= TRUE;
 
                while (PyDict_Next(kw, &pos, &key, &value)) {
 
                        arg_name= _PyUnicode_AsString(key);
-                       found= 0;
+                       found= FALSE;
 
                        if(arg_name==NULL) { /* unlikely the argname is not a string but ignore if it is*/
                                PyErr_Clear();
@@ -2012,28 +2018,28 @@ static PyObject * pyrna_func_call(PyObject * self, PyObject *args, PyObject *kw)
                                for(; iter.valid; RNA_parameter_list_next(&iter)) {
                                        parm= iter.parm;
                                        if (strcmp(arg_name, RNA_property_identifier(parm))==0) {
-                                               found= 1;
+                                               found= TRUE;
                                                break;
                                        }
                                }
 
                                RNA_parameter_list_end(&iter);
 
-                               if(!found) {
+                               if(found==FALSE) {
                                        BLI_dynstr_appendf(bad_args, first ? "%s" : ", %s", arg_name);
-                                       first= 0;
+                                       first= FALSE;
                                }
                        }
                }
 
                /* list good args */
-               first= 1;
+               first= TRUE;
 
                RNA_parameter_list_begin(&parms, &iter);
                for(; iter.valid; RNA_parameter_list_next(&iter)) {
                        parm= iter.parm;
                        BLI_dynstr_appendf(good_args, first ? "%s" : ", %s", RNA_property_identifier(parm));
-                       first= 0;
+                       first= FALSE;
                }
                RNA_parameter_list_end(&iter);
 
@@ -2090,13 +2096,7 @@ static PyObject * pyrna_func_call(PyObject * self, PyObject *args, PyObject *kw)
 
 /*-----------------------BPy_StructRNA method def------------------------------*/
 PyTypeObject pyrna_struct_Type = {
-#if (PY_VERSION_HEX >= 0x02060000)
        PyVarObject_HEAD_INIT(NULL, 0)
-#else
-       /* python 2.5 and below */
-       PyObject_HEAD_INIT( NULL )  /* required py macro */
-       0,                          /* ob_size */
-#endif
        "StructRNA",                    /* tp_name */
        sizeof( BPy_StructRNA ),        /* tp_basicsize */
        0,                      /* tp_itemsize */
@@ -2175,14 +2175,7 @@ PyTypeObject pyrna_struct_Type = {
 
 /*-----------------------BPy_PropertyRNA method def------------------------------*/
 PyTypeObject pyrna_prop_Type = {
-#if (PY_VERSION_HEX >= 0x02060000)
        PyVarObject_HEAD_INIT(NULL, 0)
-#else
-       /* python 2.5 and below */
-       PyObject_HEAD_INIT( NULL )  /* required py macro */
-       0,                          /* ob_size */
-#endif
-       
        "PropertyRNA",          /* tp_name */
        sizeof( BPy_PropertyRNA ),                      /* tp_basicsize */
        0,                      /* tp_itemsize */
@@ -2282,6 +2275,15 @@ static void pyrna_subtype_set_rna(PyObject *newclass, StructRNA *srna)
        /* done with rna instance */
 }
 
+static struct PyMethodDef pyrna_struct_subtype_methods[] = {
+       {"FloatProperty", (PyCFunction)BPy_FloatProperty, METH_VARARGS|METH_KEYWORDS, ""},
+       {"IntProperty", (PyCFunction)BPy_IntProperty, METH_VARARGS|METH_KEYWORDS, ""},
+       {"BoolProperty", (PyCFunction)BPy_BoolProperty, METH_VARARGS|METH_KEYWORDS, ""},
+       {"StringProperty", (PyCFunction)BPy_StringProperty, METH_VARARGS|METH_KEYWORDS, ""},
+       {NULL, NULL, 0, NULL}
+};
+
+
 PyObject* pyrna_srna_Subtype(StructRNA *srna)
 {
        PyObject *newclass = NULL;
@@ -2291,31 +2293,23 @@ PyObject* pyrna_srna_Subtype(StructRNA *srna)
        } else if ((newclass= RNA_struct_py_type_get(srna))) {
                Py_INCREF(newclass);
        } else {
-               StructRNA *base;
-               
-               /* for now, return the base RNA type rather then a real module */
-               
-               /* Assume RNA_struct_py_type_get(srna) was alredy checked */
-               
                /* subclass equivelents
                - class myClass(myBase):
                        some='value' # or ...
                - myClass = type(name='myClass', bases=(myBase,), dict={'__module__':'bpy.types'})
                */
-               const char *descr= RNA_struct_ui_description(srna);
 
-               PyObject *args = PyTuple_New(3);
-               PyObject *bases = PyTuple_New(1);
+               /* Assume RNA_struct_py_type_get(srna) was alredy checked */
+               StructRNA *base;
+
                PyObject *py_base= NULL;
-               PyObject *dict = PyDict_New();
-               PyObject *item;
-       
-               
-               // arg 1
-               //PyTuple_SET_ITEM(args, 0, PyUnicode_FromString(tp_name));
-               PyTuple_SET_ITEM(args, 0, PyUnicode_FromString(RNA_struct_identifier(srna)));
+
+               const char *idname= RNA_struct_identifier(srna);
+               const char *descr= RNA_struct_ui_description(srna);
+
+               if(!descr) descr= "(no docs)";
                
-               // arg 2
+               /* get the base type */
                base= RNA_struct_base(srna);
                if(base && base != srna) {
                        /*/printf("debug subtype %s %p\n", RNA_struct_identifier(srna), srna); */
@@ -2327,37 +2321,22 @@ PyObject* pyrna_srna_Subtype(StructRNA *srna)
                        Py_INCREF(py_base);
                }
                
-               PyTuple_SET_ITEM(bases, 0, py_base);
-
-               PyTuple_SET_ITEM(args, 1, bases);
-               
-               // arg 3 - add an instance of the rna 
-               if(descr) {
-                       item= PyUnicode_FromString(descr);
-                       PyDict_SetItemString(dict, "__doc__", item);
-                       Py_DECREF(item);
-               }
-               
-               /* this isnt needed however its confusing if we get python script names in blender types,
-                * because the __module__ is used when printing the class */
-               item= PyUnicode_FromString("bpy.types"); /* just to know its an internal type */
-               PyDict_SetItemString(dict, "__module__", item);
-               Py_DECREF(item);
-               
-               
-               PyTuple_SET_ITEM(args, 2, dict); // fill with useful subclass things!
-               
-               if (PyErr_Occurred()) {
-                       PyErr_Print();
-                       PyErr_Clear();
-               }
-               
-               newclass = PyObject_CallObject((PyObject *)&PyType_Type, args);
-               Py_DECREF(args);
+               newclass = PyObject_CallFunction(       (PyObject*)&PyType_Type, "s(N){ssss}", idname, py_base, "__module__","bpy.types", "__doc__",descr);
 
                if (newclass) {
                        pyrna_subtype_set_rna(newclass, srna);
                        // PyObSpit("NewStructRNA Type: ", (PyObject *)newclass);
+
+                       /* attach functions into the class
+                        * so you can do... bpy.types.Scene.SomeFunction()
+                        */
+                       {
+                               PyMethodDef *ml;
+                               for(ml= pyrna_struct_subtype_methods; ml->ml_name; ml++){
+                                       PyObject_SetAttrString(newclass, ml->ml_name, PyCFunction_New(ml, newclass));
+                               }
+                       }
+
                }
                else {
                        /* this should not happen */
@@ -2400,7 +2379,7 @@ PyObject *pyrna_struct_CreatePyObject( PointerRNA *ptr )
        }
        
        pyrna->ptr= *ptr;
-       pyrna->freeptr= 0;
+       pyrna->freeptr= FALSE;
        
        // PyObSpit("NewStructRNA: ", (PyObject *)pyrna);
        
@@ -2547,7 +2526,6 @@ static struct PyMethodDef props_methods[] = {
        {NULL, NULL, 0, NULL}
 };
 
-#if PY_VERSION_HEX >= 0x03000000
 static struct PyModuleDef props_module = {
        PyModuleDef_HEAD_INIT,
        "bpy.props",
@@ -2556,16 +2534,11 @@ static struct PyModuleDef props_module = {
        props_methods,
        NULL, NULL, NULL, NULL
 };
-#endif
 
 PyObject *BPY_rna_props( void )
 {
-       PyObject *submodule, *mod;
-#if PY_VERSION_HEX >= 0x03000000
+       PyObject *submodule;
        submodule= PyModule_Create(&props_module);
-#else /* Py2.x */
-       submodule= Py_InitModule3( "bpy.props", props_methods, "" );
-#endif
        
        /* INCREF since its its assumed that all these functions return the
         * module with a new ref like PyDict_New, since they are passed to
@@ -2577,6 +2550,45 @@ PyObject *BPY_rna_props( void )
 
 /* Orphan functions, not sure where they should go */
 
+/* get the srna for methods attached to types */
+static StructRNA *srna_from_self(PyObject *self)
+{
+       BPy_StructRNA *py_srna;
+
+       if(self==NULL) {
+               PyErr_SetString(PyExc_SystemError, "internal error, self was NULL, should never happen.");
+               return NULL;
+       }
+
+       if (PyCObject_Check(self)) {
+               return PyCObject_AsVoidPtr(self);
+       }
+
+       py_srna= (BPy_StructRNA *)PyObject_GetAttrString(self, "__rna__");
+
+       if(py_srna==NULL) {
+               PyErr_SetString(PyExc_SystemError, "internal error, self had no __rna__ attribute, should never happen.");
+               return NULL;
+       }
+
+       if(!BPy_StructRNA_Check(py_srna)) {
+               PyErr_SetString(PyExc_SystemError, "internal error, self's __rna__ attribute isnt a StructRNA type, should never happen.");
+               return NULL;
+       }
+
+       if((py_srna->ptr.data && py_srna->ptr.type == &RNA_Struct) == 0) {
+               PyErr_SetString(PyExc_SystemError, "internal error, self's __rna__ attribute wasnt an RNA_Struct, should never happen.");
+               return NULL;
+       }
+
+       if(!RNA_struct_is_ID(py_srna->ptr.data)) {
+               PyErr_SetString(PyExc_TypeError, "only ID types support python defined properties");
+               return NULL;
+       }
+
+       return py_srna->ptr.data;
+}
+
 /* Function that sets RNA, NOTE - self is NULL when called from python, but being abused from C so we can pass the srna allong
  * This isnt incorrect since its a python object - but be careful */
 PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw)
@@ -2584,7 +2596,9 @@ PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw)
        static char *kwlist[] = {"attr", "name", "description", "min", "max", "soft_min", "soft_max", "default", NULL};
        char *id, *name="", *description="";
        float min=FLT_MIN, max=FLT_MAX, soft_min=FLT_MIN, soft_max=FLT_MAX, def=0.0f;
-       
+       PropertyRNA *prop;
+       StructRNA *srna;
+
        if (!PyArg_ParseTupleAndKeywords(args, kw, "s|ssfffff:FloatProperty", kwlist, &id, &name, &description, &min, &max, &soft_min, &soft_max, &def))
                return NULL;
        
@@ -2593,17 +2607,21 @@ PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw)
                return NULL;
        }
        
-       if (self && PyCObject_Check(self)) {
-               StructRNA *srna = PyCObject_AsVoidPtr(self);
-               RNA_def_float(srna, id, def, min, max, name, description, soft_min, soft_max);
-               Py_RETURN_NONE;
-       } else {
+       if(((self && (PyCObject_Check(self))) || (self && BPy_StructRNA_Check(self))) == 0) {
                PyObject *ret = PyTuple_New(2);
                PyTuple_SET_ITEM(ret, 0, PyCObject_FromVoidPtr((void *)BPy_FloatProperty, NULL));
                PyTuple_SET_ITEM(ret, 1, kw);
                Py_INCREF(kw);
                return ret;
        }
+
+       srna= srna_from_self(self);
+       if(srna==NULL)
+               return NULL;
+
+       prop= RNA_def_float(srna, id, def, min, max, name, description, soft_min, soft_max);
+       RNA_def_property_duplicate_pointers(prop);
+       Py_RETURN_NONE;
 }
 
 PyObject *BPy_IntProperty(PyObject *self, PyObject *args, PyObject *kw)
@@ -2611,7 +2629,9 @@ PyObject *BPy_IntProperty(PyObject *self, PyObject *args, PyObject *kw)
        static char *kwlist[] = {"attr", "name", "description", "min", "max", "soft_min", "soft_max", "default", NULL};
        char *id, *name="", *description="";
        int min=INT_MIN, max=INT_MAX, soft_min=INT_MIN, soft_max=INT_MAX, def=0;
-       
+       PropertyRNA *prop;
+       StructRNA *srna;
+
        if (!PyArg_ParseTupleAndKeywords(args, kw, "s|ssiiiii:IntProperty", kwlist, &id, &name, &description, &min, &max, &soft_min, &soft_max, &def))
                return NULL;
        
@@ -2620,17 +2640,21 @@ PyObject *BPy_IntProperty(PyObject *self, PyObject *args, PyObject *kw)
                return NULL;
        }
        
-       if (self && PyCObject_Check(self)) {
-               StructRNA *srna = PyCObject_AsVoidPtr(self);
-               RNA_def_int(srna, id, def, min, max, name, description, soft_min, soft_max);
-               Py_RETURN_NONE;
-       } else {
+       if(((self && (PyCObject_Check(self))) || (self && BPy_StructRNA_Check(self))) == 0) {
                PyObject *ret = PyTuple_New(2);
                PyTuple_SET_ITEM(ret, 0, PyCObject_FromVoidPtr((void *)BPy_IntProperty, NULL));
                PyTuple_SET_ITEM(ret, 1, kw);
                Py_INCREF(kw);
                return ret;
        }
+
+       srna= srna_from_self(self);
+       if(srna==NULL)
+               return NULL;
+
+       prop= RNA_def_int(srna, id, def, min, max, name, description, soft_min, soft_max);
+       RNA_def_property_duplicate_pointers(prop);
+       Py_RETURN_NONE;
 }
 
 PyObject *BPy_BoolProperty(PyObject *self, PyObject *args, PyObject *kw)
@@ -2638,7 +2662,9 @@ PyObject *BPy_BoolProperty(PyObject *self, PyObject *args, PyObject *kw)
        static char *kwlist[] = {"attr", "name", "description", "default", NULL};
        char *id, *name="", *description="";
        int def=0;
-       
+       PropertyRNA *prop;
+       StructRNA *srna;
+
        if (!PyArg_ParseTupleAndKeywords(args, kw, "s|ssi:BoolProperty", kwlist, &id, &name, &description, &def))
                return NULL;
        
@@ -2646,18 +2672,22 @@ PyObject *BPy_BoolProperty(PyObject *self, PyObject *args, PyObject *kw)
                PyErr_SetString(PyExc_ValueError, "all args must be keywors"); // TODO - py3 can enforce this.
                return NULL;
        }
-       
-       if (self && PyCObject_Check(self)) {
-               StructRNA *srna = PyCObject_AsVoidPtr(self);
-               RNA_def_boolean(srna, id, def, name, description);
-               Py_RETURN_NONE;
-       } else {
+
+       if(((self && (PyCObject_Check(self))) || (self && BPy_StructRNA_Check(self))) == 0) {
                PyObject *ret = PyTuple_New(2);
                PyTuple_SET_ITEM(ret, 0, PyCObject_FromVoidPtr((void *)BPy_BoolProperty, NULL));
                PyTuple_SET_ITEM(ret, 1, kw);
                Py_INCREF(kw);
                return ret;
        }
+
+       srna= srna_from_self(self);
+       if(srna==NULL)
+               return NULL;
+
+       prop= RNA_def_boolean(srna, id, def, name, description);
+       RNA_def_property_duplicate_pointers(prop);
+       Py_RETURN_NONE;
 }
 
 PyObject *BPy_StringProperty(PyObject *self, PyObject *args, PyObject *kw)
@@ -2665,7 +2695,9 @@ PyObject *BPy_StringProperty(PyObject *self, PyObject *args, PyObject *kw)
        static char *kwlist[] = {"attr", "name", "description", "maxlen", "default", NULL};
        char *id, *name="", *description="", *def="";
        int maxlen=0;
-       
+       PropertyRNA *prop;
+       StructRNA *srna;
+
        if (!PyArg_ParseTupleAndKeywords(args, kw, "s|ssis:StringProperty", kwlist, &id, &name, &description, &maxlen, &def))
                return NULL;
        
@@ -2673,18 +2705,22 @@ PyObject *BPy_StringProperty(PyObject *self, PyObject *args, PyObject *kw)
                PyErr_SetString(PyExc_ValueError, "all args must be keywors"); // TODO - py3 can enforce this.
                return NULL;
        }
-       
-       if (self && PyCObject_Check(self)) {
-               StructRNA *srna = PyCObject_AsVoidPtr(self);
-               RNA_def_string(srna, id, def, maxlen, name, description);
-               Py_RETURN_NONE;
-       } else {
+
+       if(((self && (PyCObject_Check(self))) || (self && BPy_StructRNA_Check(self))) == 0) {
                PyObject *ret = PyTuple_New(2);
                PyTuple_SET_ITEM(ret, 0, PyCObject_FromVoidPtr((void *)BPy_StringProperty, NULL));
                PyTuple_SET_ITEM(ret, 1, kw);
                Py_INCREF(kw);
                return ret;
        }
+
+       srna= srna_from_self(self);
+       if(srna==NULL)
+               return NULL;
+
+       prop= RNA_def_string(srna, id, def, maxlen, name, description);
+       RNA_def_property_duplicate_pointers(prop);
+       Py_RETURN_NONE;
 }
 
 /*-------------------- Type Registration ------------------------*/
@@ -2799,7 +2835,7 @@ static int bpy_class_validate(PointerRNA *dummyptr, void *py_data, int *have_fun
                                if(item) {
                                        Py_DECREF(item); /* no need to keep a ref, the class owns it */
 
-                                       if(pyrna_py_to_prop(dummyptr, prop, NULL, item) != 0)
+                                       if(pyrna_py_to_prop(dummyptr, prop, NULL, item, "validating class error:") != 0)
                                                return -1;
                                }
                        }
@@ -2814,7 +2850,7 @@ static int bpy_class_validate(PointerRNA *dummyptr, void *py_data, int *have_fun
                else {
                        Py_DECREF(item); /* no need to keep a ref, the class owns it */
 
-                       if(pyrna_py_to_prop(dummyptr, prop, NULL, item) != 0)
+                       if(pyrna_py_to_prop(dummyptr, prop, NULL, item, "validating class error:") != 0)
                                return -1;
                }
        }
@@ -2834,9 +2870,10 @@ static int bpy_class_call(PointerRNA *ptr, FunctionRNA *func, ParameterList *par
        void *retdata= NULL;
        int err= 0, i, flag;
 
-       PyGILState_STATE gilstate = PyGILState_Ensure();
+       PyGILState_STATE gilstate;
 
-       BPY_update_modules(); // XXX - the RNA pointers can change so update before running, would like a nicer solution for this.
+       bContext *C= BPy_GetContext(); // XXX - NEEDS FIXING, QUITE BAD.
+       bpy_context_set(C, &gilstate);
 
        py_class= RNA_struct_py_type_get(ptr->type);
        
@@ -2899,16 +2936,20 @@ static int bpy_class_call(PointerRNA *ptr, FunctionRNA *func, ParameterList *par
        }
 
        if (ret == NULL) { /* covers py_class_instance failing too */
-               PyErr_Print(); /* XXX use reporting api? */
                err= -1;
        }
        else {
                if(retdata)
-                       err= pyrna_py_to_prop(&funcptr, pret, retdata, ret);
+                       err= pyrna_py_to_prop(&funcptr, pret, retdata, ret, "calling class function:");
                Py_DECREF(ret);
        }
 
-       PyGILState_Release(gilstate);
+       if(err != 0) {
+               PyErr_Print();
+               PyErr_Clear();
+       }
+
+       bpy_context_clear(C, &gilstate);
        
        return err;
 }